Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Cost>
+    <Population>0</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>150</food>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Cost>
+    <Population>0</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>150</food>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
   <Cost>
+    <Population>0</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>150</food>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
+    <Population>0</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <food>35</food>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
+    <Population>0</Population>
     <BuildTime>50</BuildTime>
     <Resources>
       <food>75</food>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
+    <Population>0</Population>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>50</food>
Index: binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit.xml
+++ binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AIProxy/>
-  <Cost>
-    <Population>1</Population>
-    <BuildTime>1</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
   <Decay>
     <Active>false</Active>
     <SinkingAnim>false</SinkingAnim>
@@ -33,19 +23,9 @@
   </Health>
   <Identity>
     <Civ>gaia</Civ>
-    <Classes datatype="tokens">Unit Organic ConquestCritical</Classes>
-    <GenericName>Unit</GenericName>
-    <Formations datatype="tokens">
-      special/formations/null
-      special/formations/box
-      special/formations/column_closed
-      special/formations/line_closed
-      special/formations/column_open
-      special/formations/line_open
-      special/formations/flank
-      special/formations/battle_line
-    </Formations>
     <Phenotype datatype="tokens">male</Phenotype>
+    <GenericName>Unit</GenericName>
+    <Classes datatype="tokens">Unit</Classes>
     <Undeletable>false</Undeletable>
   </Identity>
   <Looter/>
@@ -83,19 +63,6 @@
       </Damage>
     </Entity>
   </Resistance>
-  <ResourceGatherer>
-    <MaxDistance>2.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
-    <Rates>
-      <treasure>1</treasure>
-    </Rates>
-    <Capacities>
-      <food>10</food>
-      <wood>10</wood>
-      <stone>10</stone>
-      <metal>10</metal>
-    </Capacities>
-  </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
@@ -5,20 +5,17 @@
     <GarrisonRegenRate>0</GarrisonRegenRate>
     <RegenRate>10</RegenRate>
   </Capturable>
-  <Cost disable=""/>
   <Footprint replace="">
     <Height>2.0</Height>
     <Square width="5.0" depth="12.0"/>
   </Footprint>
   <Health disable=""/>
   <Identity>
-    <Classes datatype="tokens">-Organic -ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Relic</VisibleClasses>
-    <Formations disable=""/>
     <GenericName>Catafalque</GenericName>
-    <Icon>units/catafalque.png</Icon>
     <SelectionGroupName>template_unit_catafalque</SelectionGroupName>
     <Tooltip>A catafalque that holds the remains of a great leader.</Tooltip>
+    <VisibleClasses datatype="tokens">Relic</VisibleClasses>
+    <Icon>units/catafalque.png</Icon>
     <Undeletable>true</Undeletable>
   </Identity>
   <Minimap>
@@ -28,7 +25,6 @@
     <Anchor>pitch-roll</Anchor>
   </Position>
   <Resistance replace=""/>
-  <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
+<Entity parent="template_unit_soldier">
   <Attack>
-    <Capture>
-      <AttackName>Capture</AttackName>
-      <Capture>2.5</Capture>
-      <MaxRange>4</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
-    </Capture>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
@@ -29,8 +22,8 @@
   <Identity>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
-    <Classes datatype="tokens">Human FastMoving CitizenSoldier</Classes>
-    <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
+    <Classes datatype="tokens">FastMoving CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
@@ -39,8 +32,6 @@
     <xp>130</xp>
     <food>10</food>
     <wood>5</wood>
-    <stone>0</stone>
-    <metal>0</metal>
   </Loot>
   <Position>
     <TurnRate>5</TurnRate>
@@ -58,16 +49,11 @@
     </Entity>
   </Resistance>
   <ResourceGatherer>
-    <MaxDistance>2.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>5</food.meat>
     </Rates>
     <Capacities>
       <food>20</food>
-      <wood>20</wood>
-      <stone>20</stone>
-      <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
@@ -81,11 +67,6 @@
   <Sound>
     <SoundGroups>
       <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
-      <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>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <gather_meat>resource/gathering/gather_meat.xml</gather_meat>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
+<Entity parent="template_unit_soldier">
   <Attack>
     <Capture>
-      <AttackName>Capture</AttackName>
-      <Capture>5</Capture>
-      <MaxRange>4</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+      <Capture op="mul">2</Capture>
     </Capture>
   </Attack>
   <Identity>
-    <Classes datatype="tokens">Human</Classes>
-    <VisibleClasses datatype="tokens">Soldier Champion</VisibleClasses>
     <GenericName>Champion Unit</GenericName>
+    <VisibleClasses datatype="tokens">Champion</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Selectable>
@@ -23,13 +18,4 @@
       </Texture>
     </Overlay>
   </Selectable>
-  <Sound>
-    <SoundGroups>
-      <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>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-    </SoundGroups>
-  </Sound>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -15,8 +15,8 @@
     </Melee>
   </Attack>
   <Cost>
-    <BuildTime>15</BuildTime>
     <Population>0</Population>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
@@ -31,14 +31,13 @@
   <Identity>
     <GenericName>War Dog</GenericName>
     <Tooltip>Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
-    <Classes datatype="tokens">Human FastMoving</Classes>
+    <Classes datatype="tokens">Organic Human FastMoving ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Dog Melee</VisibleClasses>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>10</food>
   </Loot>
-  <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_elephant.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
+<Entity parent="template_unit_soldier">
+  <Attack>
+    <Capture disable=""/>
+  </Attack>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>9.0</Height>
@@ -7,8 +10,8 @@
   <Identity>
     <GenericName>War Elephant</GenericName>
     <Rank>Basic</Rank>
-    <Classes datatype="tokens">Human CitizenSoldier</Classes>
-    <VisibleClasses datatype="tokens">Citizen Soldier Elephant</VisibleClasses>
+    <Classes datatype="tokens">CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Elephant</VisibleClasses>
   </Identity>
   <Loot>
     <xp>260</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Cost>
-    <Population>0</Population>
-  </Cost>
   <Footprint replace="">
     <Square width="2.0" depth="4.0"/>
     <Height>4.0</Height>
   </Footprint>
   <Guard disable=""/>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical Animal</Classes>
+    <GenericName>Animal</GenericName>
+    <Classes datatype="tokens">Organic Animal</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
-    <Formations disable=""/>
   </Identity>
   <Loot disable=""/>
   <Minimap>
@@ -21,7 +18,6 @@
   <Position>
     <TurnRate>4</TurnRate>
   </Position>
-  <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
+<Entity parent="template_unit_soldier">
   <Attack>
     <Capture>
-      <AttackName>Capture</AttackName>
-      <Capture>10</Capture>
-      <MaxRange>4</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+      <Capture op="mul">4</Capture>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
@@ -21,17 +17,14 @@
     </Resources>
   </Cost>
   <Identity>
-    <Classes datatype="tokens">Human</Classes>
-    <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
+    <VisibleClasses datatype="tokens">Hero</VisibleClasses>
     <Icon>technologies/laurel_wreath.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>400</xp>
     <food>10</food>
-    <wood>0</wood>
-    <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Minimap>
@@ -48,11 +41,6 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <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>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
+<Entity parent="template_unit_soldier">
   <Attack>
-    <Capture>
-      <AttackName>Capture</AttackName>
-      <Capture>2.5</Capture>
-      <MaxRange>4</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
-    </Capture>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
@@ -51,26 +44,20 @@
     <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Human CitizenSoldier</Classes>
-    <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
     <Rank>Basic</Rank>
+    <Classes datatype="tokens">CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Worker Infantry</VisibleClasses>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
-    <wood>0</wood>
-    <stone>0</stone>
-    <metal>0</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
@@ -88,8 +75,6 @@
     </Entity>
   </Resistance>
   <ResourceGatherer>
-    <MaxDistance>2.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.25</food.grain>
@@ -104,13 +89,8 @@
   <Sound>
     <SoundGroups>
       <attack_slaughter>attack/weapon/knife_attack.xml</attack_slaughter>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -25,9 +25,7 @@
   </Health>
   <Identity>
     <GenericName>Ship</GenericName>
-    <Classes datatype="tokens">-Organic</Classes>
     <VisibleClasses datatype="tokens">Ship</VisibleClasses>
-    <Formations disable=""/>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -47,6 +47,7 @@
   <Identity>
     <GenericName>Light Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
@@ -55,7 +56,6 @@
     <wood>25</wood>
     <metal>15</metal>
   </Loot>
-  <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -13,6 +13,7 @@
     </Melee>
   </Attack>
   <Cost>
+    <Population>1</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>300</wood>
@@ -39,12 +40,12 @@
   <Identity>
     <GenericName>Fire Ship</GenericName>
     <Tooltip>Unrepairable. Gradually loses health. Can only attack Ships.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Melee Warship Fireship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot disable=""/>
   <Repairable disable=""/>
-  <ResourceGatherer disable=""/>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.6</WalkSpeed>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -15,6 +15,7 @@
     </Melee>
   </Attack>
   <Cost>
+    <Population>1</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>50</wood>
@@ -30,7 +31,6 @@
     <GenericName>Fishing Boat</GenericName>
     <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
   </Identity>
   <Loot>
@@ -48,9 +48,9 @@
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>1.8</food.fish>
-      <treasure disable=""/>
     </Rates>
     <Capacities>
       <food>40</food>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Cost>
+    <Population>1</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <metal>100</metal>
@@ -17,7 +18,6 @@
     <GenericName>Merchantman</GenericName>
     <SelectionGroupName>template_unit_ship_merchant</SelectionGroupName>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
@@ -36,6 +36,16 @@
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <treasure>1</treasure>
+    </Rates>
+    <Capacities>
+      <food>10</food>
+      <wood>10</wood>
+      <stone>10</stone>
+      <metal>10</metal>
+    </Capacities>
   </ResourceGatherer>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -48,6 +48,7 @@
   <Identity>
     <GenericName>Heavy Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
@@ -59,7 +60,6 @@
   <Position>
     <TurnRate>2</TurnRate>
   </Position>
-  <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -47,6 +47,7 @@
   <Identity>
     <GenericName>Medium Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
@@ -58,7 +59,6 @@
   <Position>
     <TurnRate>2</TurnRate>
   </Position>
-  <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege.xml
@@ -12,9 +12,18 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-Organic</Classes>
-    <VisibleClasses datatype="tokens">Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
+    <VisibleClasses datatype="tokens">Siege</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/null
+      special/formations/box
+      special/formations/column_closed
+      special/formations/line_closed
+      special/formations/column_open
+      special/formations/line_open
+      special/formations/flank
+      special/formations/battle_line
+    </Formations>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Position>
@@ -33,6 +42,19 @@
       </Damage>
     </Entity>
   </Resistance>
+  <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <treasure>1</treasure>
+    </Rates>
+    <Capacities>
+      <food>10</food>
+      <wood>10</wood>
+      <stone>10</stone>
+      <metal>10</metal>
+    </Capacities>
+  </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/template_unit_soldier.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_soldier.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit">
+  <Attack>
+    <Capture>
+      <AttackName>Capture</AttackName>
+      <Capture>2.5</Capture>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+    </Capture>
+  </Attack>
+  <Cost>
+    <Population>1</Population>
+  </Cost>
+  <Identity>
+    <GenericName>Soldier</GenericName>
+    <Classes datatype="tokens">Organic Human ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Soldier</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/null
+      special/formations/box
+      special/formations/column_closed
+      special/formations/line_closed
+      special/formations/column_open
+      special/formations/line_open
+      special/formations/flank
+      special/formations/battle_line
+    </Formations>
+  </Identity>
+  <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <treasure>1</treasure>
+    </Rates>
+    <Capacities>
+      <food>10</food>
+      <wood>10</wood>
+      <stone>10</stone>
+      <metal>10</metal>
+    </Capacities>
+  </ResourceGatherer>
+  <Sound>
+    <SoundGroups>
+      <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>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_support.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Cost>
+    <Population>1</Population>
+  </Cost>
   <Identity>
+    <GenericName>Support Unit</GenericName>
     <Classes datatype="tokens">Human Organic</Classes>
     <VisibleClasses datatype="tokens">Support</VisibleClasses>
-    <GenericName>Support</GenericName>
   </Identity>
   <Minimap>
     <Type>support</Type>
@@ -20,6 +23,19 @@
       </Damage>
     </Entity>
   </Resistance>
+  <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <treasure>1</treasure>
+    </Rates>
+    <Capacities>
+      <food>10</food>
+      <wood>10</wood>
+      <stone>10</stone>
+      <metal>10</metal>
+    </Capacities>
+  </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -61,20 +61,17 @@
     <Max>25</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">FemaleCitizen</Classes>
-    <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
+    <Phenotype>female</Phenotype>
     <GenericName>Female Citizen</GenericName>
     <SelectionGroupName>template_unit_support_female_citizen</SelectionGroupName>
-    <Phenotype>female</Phenotype>
-    <Formations disable=""/>
+    <Classes datatype="tokens">ConquestCritical FemaleCitizen</Classes>
+    <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
   </Identity>
   <Loot>
     <xp>3</xp>
     <food>5</food>
   </Loot>
   <ResourceGatherer>
-    <MaxDistance>2.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>1</food.fruit>
       <food.grain>0.5</food.grain>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -22,13 +22,12 @@
     <Max>85</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
     <SelectionGroupName>template_unit_support_healer</SelectionGroupName>
+    <Tooltip>Heal units.</Tooltip>
     <Rank>Basic</Rank>
+    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <Tooltip>Heal units.</Tooltip>
   </Identity>
   <Loot>
     <xp>8</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -43,10 +43,11 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Slave Worker</VisibleClasses>
     <GenericName>Slave</GenericName>
     <SelectionGroupName>template_unit_support_slave</SelectionGroupName>
     <Tooltip>Gatherer with a finite life span. Bonused at mining and lumbering.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Worker Slave</VisibleClasses>
   </Identity>
   <Loot>
     <xp>10</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -11,12 +11,10 @@
     <Max>100</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <GenericName>Trader</GenericName>
     <SelectionGroupName>template_unit_support_trader</SelectionGroupName>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
-    <Formations disable=""/>
+    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
   </Identity>
   <Loot>
     <xp>10</xp>
Index: binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
@@ -22,7 +22,6 @@
     <SpecificName>Karmākara Gaja</SpecificName>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <Icon>units/maur_support_elephant.png</Icon>
-    <Formations disable=""/>
   </Identity>
   <Loot>
     <food>10</food>
Index: binaries/data/mods/public/simulation/templates/units/plane.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/plane.xml
+++ binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -46,10 +46,11 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
+    <GenericName>Fighter Aircraft</GenericName>
     <SpecificName>P-51 Mustang</SpecificName>
-    <Tooltip>A World War II American fighter plane.</Tooltip>
+    <History>A World War II fighter plane designed by North American Aviation.</History>
+    <Classes datatype="tokens">ConquestCritical</Classes>
     <Icon>units/global_mustang.png</Icon>
-    <Formations datatype="tokens" replace=""/>
   </Identity>
   <Obstruction disable=""/>
   <Position>