Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/chariot.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/chariot.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <BuildTime op="mul">1.2</BuildTime>
+    <Resources>
+      <food op="mul_round">1.2</food>
+      <wood op="mul_round">1.25</wood>
+      <stone op="mul_round">1.2</stone>
+      <metal op="mul_round">1.2</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">1.25</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+  </Identity>
+  <Loot>
+    <food op="mul_round">1.2</food>
+    <wood op="mul_round">1.2</wood>
+    <stone op="mul_round">1.2</stone>
+    <metal op="mul_round">1.2</metal>
+    <xp op="mul_round">1.2</xp>
+  </Loot>
+  <Position>
+    <TurnRate>5</TurnRate>
+  </Position>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">2</Pierce>
+      </Damage>
+    </Entity>
+  </Resistance>
+  <ResourceGatherer disable=""/>
+  <UnitMotion>
+    <WalkSpeed op="mul_round">1.1</WalkSpeed>
+    <PassabilityClass>large</PassabilityClass>
+    <Acceleration op="mul">0.5</Acceleration>
+    <Weight op="mul">3.0</Weight>
+  </UnitMotion>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot.xml
+++ ps/trunk/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="chariot|template_unit_champion_cavalry_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>
     <Requirements>
       <Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/hero_boudicca.xml
+++ ps/trunk/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="chariot|template_unit_hero_cavalry_javelineer">
   <Auras datatype="tokens">
     units/heroes/brit_hero_boudicca
   </Auras>
@@ -12,7 +12,6 @@
     <Phenotype>female</Phenotype>
     <GenericName>Boudicca</GenericName>
     <SpecificName>Boudica</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/brit/hero_boudicca.png</Icon>
   </Identity>
   <Selectable>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_cavalry_archer">
+<Entity parent="chariot|template_unit_champion_cavalry_archer">
   <Footprint replace="">
     <Square depth="10.0" width="10.0"/>
     <Height>5.0</Height>
@@ -8,7 +8,6 @@
     <Civ>han</Civ>
     <GenericName>Han War Chariot</GenericName>
     <SpecificName>Zhanche</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/han/chariot.png</Icon>
     <Requirements>
       <Techs datatype="tokens">-unlock_champion_cavalry phase_city</Techs>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_chariot.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/hero_wei_qing_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_crossbowman">
+<Entity parent="chariot|template_unit_hero_cavalry_crossbowman">
   <Auras datatype="tokens">
     units/heroes/han_hero_wei_qing_1
     units/heroes/han_hero_wei_qing_2
@@ -18,7 +18,6 @@
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Wèi Qīng</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/han/hero_wei_qing.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/hero_amanirenas.xml
+++ ps/trunk/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="chariot|template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/kush_hero_amanirenas
   </Auras>
@@ -13,7 +13,6 @@
     <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>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_chariot.xml
+++ ps/trunk/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="chariot|template_unit_champion_cavalry_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>
     <Requirements>
       <Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/hero_ashoka.xml
+++ ps/trunk/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="chariot|template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/maur_hero_ashoka
   </Auras>
@@ -12,7 +12,6 @@
     <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>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_chariot.xml
+++ ps/trunk/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="chariot|template_unit_champion_cavalry_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>
     <Requirements>
       <Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_darius_i.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="chariot|template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_darius_i
   </Auras>
@@ -12,7 +12,6 @@
     <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>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_archer">
+<Entity parent="chariot|template_unit_hero_cavalry_archer">
   <Auras datatype="tokens">
     units/heroes/pers_hero_xerxes_i
   </Auras>
@@ -12,7 +12,6 @@
     <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>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
+++ ps/trunk/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="chariot|template_unit_champion_cavalry_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>
     <Requirements>
       <Techs datatype="tokens">-unlock_champion_cavalry unlock_champion_chariots</Techs>