Index: binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_fortress.xml
@@ -7,20 +7,11 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Epiteíkhisma</SpecificName>
-    <Tooltip>Build siege engines. Garrison soldiers inside for stout defense.</Tooltip>
+    <Tooltip>Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/fortress.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -13,25 +13,18 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Dunon</SpecificName>
-    <Tooltip>Train Brythonic heroes and champions. Construct siege rams.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
@@ -14,18 +14,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_elephant
       units/{civ}_hero_hamilcar
       units/{civ}_hero_hannibal
       units/{civ}_hero_maharbal
-      units/{civ}_champion_elephant
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <FoundationActor>structures/carthaginians/fndn_fortress.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -6,22 +6,15 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
-    <Tooltip>Train Gallic heroes and champions. Construct siege rams.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -19,18 +19,12 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_caros
       units/{civ}_hero_indibil
       units/{civ}_hero_viriato
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -7,24 +7,17 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Teíchisma</SpecificName>
-    <Tooltip>Train Champions and Heroes. Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry_a
+      units/{civ}_champion_cavalry
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
       units/{civ}_hero_demetrius
-      units/{civ}_champion_infantry_a
-      units/{civ}_champion_cavalry
-      -units/{civ}_siege_ballista_packed
-      -units/{civ}_siege_scorpio_packed
-      -units/{civ}_siege_oxybeles_packed
-      -units/{civ}_siege_lithobolos_packed
-      -units/{civ}_siege_ram
-      -units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -3,22 +3,15 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Durg</SpecificName>
-    <Tooltip>Train heroes and champion units.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_hero_chanakya
-      units/{civ}_hero_maurya
-      units/{civ}_hero_ashoka
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
       units/{civ}_champion_chariot
-      -units/{civ}_siege_ballista_packed
-      -units/{civ}_siege_scorpio_packed
-      -units/{civ}_siege_oxybeles_packed
-      -units/{civ}_siege_lithobolos_packed
-      -units/{civ}_siege_ram
-      -units/{civ}_siege_tower
+      units/{civ}_hero_chanakya
+      units/{civ}_hero_maurya
+      units/{civ}_hero_ashoka
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
Index: binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
@@ -3,18 +3,11 @@
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didā</SpecificName>
-    <Tooltip>Train Champion Cavalry and Construct Siege Rams.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -17,13 +17,6 @@
       units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -6,19 +6,12 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_marcellus
       units/{civ}_hero_maximus
       units/{civ}_hero_scipio
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -7,7 +7,6 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Build siege engines and train Champions. Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
@@ -22,10 +21,6 @@
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
       successors/special_war_horses
       successors/special_parade_of_daphne
     </Technologies>
Index: binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_fortress.xml
@@ -7,20 +7,11 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Teíkhisma</SpecificName>
-    <Tooltip>Build siege engines. Garrison up to 20 soldiers inside for stout defense.</Tooltip>
+    <Tooltip>Garrison soldiers inside for stout defense.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/spartans/fortress.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -68,7 +68,7 @@
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
-    <Tooltip>Train heroes, champions, and siege weapons. Research siege weapon improvements.</Tooltip>
+    <Tooltip>Train champions and heroes. Garrison soldiers inside for stout defense.</Tooltip>
     <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
     <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
@@ -84,15 +84,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_siege_ballista_packed
-      units/{civ}_siege_scorpio_packed
-      units/{civ}_siege_oxybeles_packed
-      units/{civ}_siege_lithobolos_packed
-      units/{civ}_siege_polybolos_packed
-      units/{civ}_siege_ram
-      units/{civ}_siege_tower
-    </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
     </Technologies>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -25,7 +25,7 @@
     <GenericName>Siege Workshop</GenericName>
     <Icon>structures/siege_workshop.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <Tooltip>Build siege engines to destroy your opponents buildings. Research siege technologies to improve the effectiveness of these weapons.</Tooltip>
+    <Tooltip>Construct siege engines and research siege technologies.</Tooltip>
     <VisibleClasses datatype="tokens">City Workshop</VisibleClasses>
   </Identity>
   <Loot>
@@ -37,12 +37,12 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_siege_ballista_packed
+      units/{civ}_siege_ram
       units/{civ}_siege_scorpio_packed
+      units/{civ}_siege_polybolos_packed
       units/{civ}_siege_oxybeles_packed
       units/{civ}_siege_lithobolos_packed
-      units/{civ}_siege_polybolos_packed
-      units/{civ}_siege_ram
+      units/{civ}_siege_ballista_packed
       units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
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
@@ -32,6 +32,7 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
+      structures/{civ}_workshop
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market