Index: binaries/data/mods/public/simulation/templates/template_unit_champion_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_chariot.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion">
+  <Armour>
+    <Hack>8</Hack>
+    <Pierce>8</Pierce>
+    <Crush>20</Crush>
+  </Armour>
+  <Cost>
+    <Population>2</Population>
+    <BuildTime>30</BuildTime>
+    <Resources>
+      <food>200</food>
+      <wood>160</wood>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Champion Chariot</GenericName>
+    <Classes datatype="tokens">FastMoving</Classes>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/wedge
+    </Formations>
+  </Identity>
+  <Loot>
+    <xp>250</xp>
+    <food>20</food>
+    <wood>16</wood>
+    <metal>12</metal>
+  </Loot>
+  <Sound>
+    <SoundGroups>
+      <death>actor/fauna/death/death_horse.xml</death>
+      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
+      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <run>actor/mounted/movement/walk.xml</run>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
+      <trained>interface/alarm/alarm_create_cav.xml</trained>
+      <walk>actor/mounted/movement/walk.xml</walk>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>7.0</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">2</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>90</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_chariot_archer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_chariot_archer.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_chariot">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>14</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>76</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>75.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>39.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Champion Chariot Archer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Archer</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_chariot_javelineer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_chariot_javelineer.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_chariot">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>36</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>32</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>750</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>62.5</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>39.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Champion Chariot Javelineer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_chariot.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_chariot.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero">
+  <Armour>
+    <Hack>10</Hack>
+    <Pierce>10</Pierce>
+    <Crush>25</Crush>
+  </Armour>
+  <Cost>
+    <BuildTime>50</BuildTime>
+    <Resources>
+      <food>300</food>
+      <wood>200</wood>
+      <metal>250</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>1500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Hero Chariot</GenericName>
+    <Classes datatype="tokens">FastMoving</Classes>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/wedge
+    </Formations>
+  </Identity>
+  <Selectable>
+    <Overlay>
+      <Shape>
+        <Circle radius="5.0"/>
+      </Shape>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <death>actor/fauna/death/death_horse.xml</death>
+      <run>actor/mounted/movement/walk.xml</run>
+      <trained>interface/alarm/alarm_create_cav.xml</trained>
+      <walk>actor/mounted/movement/walk.xml</walk>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>7.0</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">2</WalkSpeed>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_chariot_archer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_chariot_archer.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>35</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>80</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>1200</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>75.0</Speed>
+        <Spread>0.5</Spread>
+        <Gravity>39.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Hero Chariot Archer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Archer</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_chariot_javelineer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_chariot_javelineer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>60</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>36</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>750</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>62.5</Speed>
+        <Spread>0.5</Spread>
+        <Gravity>39.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>1500</Max>
+  </Health>
+  <Identity>
+    <GenericName>Hero Chariot Javelineer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_champion_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_javelineer">
+<Entity parent="template_unit_champion_chariot_javelineer">
   <Footprint replace="">
     <Square width="5.0" depth="10.0"/>
     <Height>6.0</Height>
@@ -9,7 +9,6 @@
     <GenericName>Celtic Chariot</GenericName>
     <SpecificName>Essedon</SpecificName>
     <SelectionGroupName>units/brit_champion_chariot</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_javelineer">
+<Entity parent="template_unit_hero_chariot_javelineer">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
@@ -12,16 +12,8 @@
     <Phenotype>female</Phenotype>
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit_hero_boudicca.png</Icon>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>units/britons/hero_chariot_javelinist_boudicca_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="template_unit_hero_chariot_archer">
   <Auras datatype="tokens">
     units/heroes/kush_hero_amanirenas
   </Auras>
@@ -12,16 +12,8 @@
     <Phenotype>female</Phenotype>
     <GenericName>Amanirenas</GenericName>
     <SpecificName>Amnirense qore li kdwe li</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/kush_hero_amanirenas.png</Icon>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>units/kushites/hero_chariot_archer_amanirenas_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
+<Entity parent="template_unit_champion_chariot_archer">
   <Footprint replace="">
     <Square width="8.0" depth="11.0"/>
     <Height>6.0</Height>
@@ -9,7 +9,6 @@
     <GenericName>War Chariot</GenericName>
     <SpecificName>Rath</SpecificName>
     <SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="template_unit_hero_chariot_archer">
   <Auras datatype="tokens">
     units/heroes/maur_hero_ashoka
   </Auras>
@@ -12,16 +12,8 @@
     <GenericName>Ashoka the Great</GenericName>
     <SpecificName>Aśoka Devānāmpriya</SpecificName>
     <Classes datatype="tokens">Ashoka</Classes>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_hero_ashoka.png</Icon>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>units/mauryas/hero_chariot_archer_ashoka_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
     <GenericName>Parthian Horse Archer</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_champion_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
+<Entity parent="template_unit_champion_chariot_archer">
   <Footprint replace="">
     <Square width="11.0" depth="11.0"/>
     <Height>6.0</Height>
@@ -9,7 +9,6 @@
     <Lang>persian</Lang>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Raθa Bābiruviya</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_chariot_archer.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="template_unit_hero_chariot_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_darius
   </Auras>
@@ -12,16 +12,8 @@
     <Lang>persian</Lang>
     <GenericName>Darius I the Great</GenericName>
     <SpecificName>Dārayavahuš</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_hero_darius.png</Icon>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>units/persians/hero_chariot_archer_darius_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="template_unit_hero_chariot_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_xerxes
   </Auras>
@@ -12,16 +12,8 @@
     <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/pers_hero_xerxes.png</Icon>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Shape>
-        <Circle radius="5.0"/>
-      </Shape>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>units/persians/hero_chariot_archer_xerxes_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
+<Entity parent="template_unit_champion_chariot_archer">
   <Footprint replace="">
     <Square width="11.0" depth="11.0"/>
     <Height>6.0</Height>
@@ -9,7 +9,6 @@
     <Lang>greek</Lang>
     <GenericName>Scythed Chariot</GenericName>
     <SpecificName>Drepanèphoros</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/sele_champion_chariot.png</Icon>
   </Identity>
   <VisualActor>