Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <food>150</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
   <Identity>
     <GenericName>Cow</GenericName>
     <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_cow.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <MaxGatherers>5</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow_trainable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_cattle_cow">
-  <Cost>
-    <BuildTime>53</BuildTime>
-    <Resources>
-      <food>75</food>
-    </Resources>
-  </Cost>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <food>150</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
   <Identity>
     <GenericName>Sanga Cattle</GenericName>
     <SpecificName>Bos taurus africanus</SpecificName>
     <Icon>gaia/fauna_sanga.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <MaxGatherers>5</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga_trainable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_cattle_sanga">
-  <Cost>
-    <BuildTime>53</BuildTime>
-    <Resources>
-      <food>75</food>
-    </Resources>
-  </Cost>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <food>150</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
   <Identity>
     <GenericName>Zebu</GenericName>
     <SpecificName>Bos taurus indicus</SpecificName>
     <Icon>gaia/fauna_zebu.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+    <MaxGatherers>5</MaxGatherers>
+  </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_cattle_zebu">
-  <Cost>
-    <BuildTime>53</BuildTime>
-    <Resources>
-      <food>75</food>
-    </Resources>
-  </Cost>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Cost>
+    <BuildTime>30</BuildTime>
+    <Resources>
+      <food>40</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>40</Max>
+  </Health>
   <Identity>
     <GenericName>Goat</GenericName>
     <SpecificName>Capra aegagrus hircus</SpecificName>
     <Icon>gaia/fauna_goat.png</Icon>
   </Identity>
   <ResourceSupply>
-    <Amount>100</Amount>
-    <MaxGatherers>6</MaxGatherers>
+    <Amount>80</Amount>
+    <MaxGatherers>2</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat_trainable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat_trainable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat_trainable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_goat">
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <food>50</food>
-    </Resources>
-  </Cost>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Cost>
+    <BuildTime>50</BuildTime>
+    <Resources>
+      <food>75</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>75</Max>
+  </Health>
   <Identity>
     <GenericName>Pig</GenericName>
     <SpecificName>Sus scrofa domesticus</SpecificName>
     <Icon>gaia/fauna_pig.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>150</Amount>
+    <MaxGatherers>4</MaxGatherers>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_select.xml</select>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_pig">
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <food>50</food>
-    </Resources>
-  </Cost>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Cost>
+    <BuildTime>40</BuildTime>
+    <Resources>
+      <food>50</food>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Sheep</GenericName>
     <SpecificName>Ovis aries</SpecificName>
     <Icon>gaia/fauna_sheep.png</Icon>
   </Identity>
+  <ResourceSupply>
+    <Amount>100</Amount>
+    <MaxGatherers>3</MaxGatherers>
+  </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/sheep_select.xml</select>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep_trainable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep_trainable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep_trainable.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_sheep">
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <food>50</food>
-    </Resources>
-  </Cost>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/corral.xml
@@ -10,12 +10,6 @@
   <Obstruction>
     <Static width="10.0" depth="19.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_pig_trainable
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/britons/plot_corral.xml</Actor>
     <FoundationActor>structures/fndn_3x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/corral.xml
@@ -12,8 +12,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_goat_trainable
+      -gaia/fauna_cattle_cow_trainable
+      gaia/fauna_cattle_sanga_trainable
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/corral.xml
@@ -10,13 +10,6 @@
   <Obstruction>
     <Static width="10.0" depth="19.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_pig_trainable
-      gaia/fauna_cattle_cow_trainable
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/plot_corral.xml</Actor>
     <FoundationActor>structures/fndn_3x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/corral.xml
@@ -10,12 +10,6 @@
   <Obstruction>
     <Static width="15.0" depth="17.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_pig_trainable
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/corral.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/corral.xml
@@ -13,8 +13,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_goat_trainable
+      -gaia/fauna_cattle_cow_trainable
       gaia/fauna_cattle_sanga_trainable
     </Entities>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/corral.xml
@@ -12,8 +12,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_goat_trainable
+      -gaia/fauna_cattle_cow_trainable
       gaia/fauna_cattle_zebu_trainable
     </Entities>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/corral.xml
@@ -24,8 +24,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      -gaia/fauna_sheep_trainable
-      gaia/fauna_goat_trainable
+      -gaia/fauna_cattle_cow_trainable
+      gaia/fauna_cattle_sanga_trainable
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -31,7 +31,10 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
+      gaia/fauna_goat_trainable
       gaia/fauna_sheep_trainable
+      gaia/fauna_pig_trainable
+      gaia/fauna_cattle_cow_trainable
     </Entities>
     <Technologies datatype="tokens">
       gather_animals_stockbreeding