Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -46,11 +46,13 @@
       units/{civ}/infantry_swordsman_b
       units/{civ}/infantry_javelineer_b
       units/{civ}/infantry_slinger_b
+      units/{civ}/infantry_crossbowman_b
       units/{civ}/infantry_archer_b
       units/{civ}/cavalry_axeman_b
       units/{civ}/cavalry_swordsman_b
       units/{civ}/cavalry_spearman_b
       units/{civ}/cavalry_javelineer_b
+      units/{civ}/cavalry_crossbowman_b
       units/{civ}/cavalry_archer_b
       units/{civ}/champion_infantry_barracks
       units/{civ}/champion_infantry_swordsman_barracks
Index: binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
@@ -37,6 +37,7 @@
     <Entities datatype="tokens">
       units/{civ}/infantry_javelineer_b
       units/{civ}/infantry_slinger_b
+      units/{civ}/infantry_crossbowman_b
       units/{civ}/infantry_archer_b
     </Entities>
     <Technologies datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -41,6 +41,7 @@
       units/{civ}/cavalry_swordsman_b
       units/{civ}/cavalry_spearman_b
       units/{civ}/cavalry_javelineer_b
+      units/{civ}/cavalry_crossbowman_b
       units/{civ}/cavalry_archer_b
       units/{civ}/champion_cavalry
     </Entities>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_ranged">
+  <Attack>
+    <Ranged>
+      <AttackName>Crossbow</AttackName>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>20</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>60</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>2400</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>100.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>30</wood>
+      <metal>20</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Cavalry Crossbowman</GenericName>
+    <VisibleClasses datatype="tokens">Crossbowman</VisibleClasses>
+  </Identity>
+  <Loot>
+    <wood>3</wood>
+    <metal>2</metal>
+  </Loot>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry">
+  <Attack>
+    <Ranged>
+      <AttackName>Crossbow</AttackName>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>40</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>60</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>2400</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>100.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Champion Cavalry Crossbowman</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry">
+  <Attack>
+    <Ranged>
+      <AttackName>Crossbow</AttackName>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>40</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>60</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>2400</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>100.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Infantry Crossbowman</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Attack>
+    <Ranged>
+      <AttackName>Crossbow</AttackName>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>80</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>60</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>2400</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>100.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Hero Cavalry Crossbowman</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Attack>
+    <Ranged>
+      <AttackName>Crossbow</AttackName>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>80</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>60</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>2400</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>100.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Hero Infantry Crossbowman</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged">
+  <Attack>
+    <Ranged>
+      <AttackName>Crossbow</AttackName>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>20</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>60</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>2400</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>100.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>30</wood>
+      <metal>20</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <GenericName>Infantry Crossbowman</GenericName>
+    <VisibleClasses datatype="tokens">Crossbowman</VisibleClasses>
+  </Identity>
+  <Loot>
+    <wood>3</wood>
+    <metal>2</metal>
+  </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
@@ -1,26 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Attack>
-    <Ranged>
-      <AttackName>Crossbow</AttackName>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>6.5</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>76</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>2320</PrepareTime>
-      <RepeatTime>3000</RepeatTime>
-      <Projectile>
-        <Speed>100.0</Speed>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
+<Entity parent="template_unit_champion_infantry_crossbowman">
   <Identity>
     <Civ>mace</Civ>
-    <VisibleClasses datatype="tokens">-Archer Crossbowman</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Champion Crossbowman</GenericName>
     <SpecificName>Gastraphetophoros</SpecificName>