Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_wall_short.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="9"/>
-    <Height>13</Height>
+    <Square width="13.0" depth="9.0"/>
+    <Height>13.0</Height>
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="8"/>
+    <Static width="12.0" depth="8.0"/>
   </Obstruction>
   <SkirmishReplacer>
     <general>structures/{civ}_wall_short</general>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/iber_wall_short.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="8"/>
-    <Height>10</Height>
+    <Square width="13.0" depth="8.0"/>
+    <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="7"/>
+    <Static width="12.0" depth="7.0"/>
   </Obstruction>
   <SkirmishReplacer/>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="6"/>
+    <Square width="13.0" depth="6.0"/>
     <Height>12.5</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="5"/>
+    <Static width="12.0" depth="5.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>13.5</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>11.5</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/hellenes/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="7"/>
+    <Square width="13.0" depth="7.0"/>
     <Height>10.3</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="6"/>
+    <Static width="12.0" depth="6.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>11.3</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>9.3</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/britons/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="structures/palisades_short">
   <Footprint>
-    <Square width="5" depth="3"/>
-    <Height>6</Height>
+    <Square width="5.0" depth="3.0"/>
+    <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
@@ -11,10 +11,10 @@
     <GenericName>Stone Wall</GenericName>
   </Identity>
   <Obstruction>
-    <Static width="4" depth="2"/>
+    <Static width="4.0" depth="2.0"/>
   </Obstruction>
   <StatusBars>
-    <HeightOffset>7</HeightOffset>
+    <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>structures/carthaginians/short_wall_short.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="8"/>
-    <Height>13</Height>
+    <Square width="13.0" depth="8.0"/>
+    <Height>13.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Homah</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="7"/>
+    <Static width="12.0" depth="7.0"/>
   </Obstruction>
   <StatusBars>
-    <HeightOffset>14</HeightOffset>
+    <HeightOffset>14.0</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>12</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/carthaginians/wall_short.xml</Actor>
     <FoundationActor>structures/carthaginians/fndn_wall_short.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="7"/>
+    <Square width="13.0" depth="7.0"/>
     <Height>10.3</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Rate</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="6"/>
+    <Static width="12.0" depth="6.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>11.3</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>9.3</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/gauls/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="8"/>
-    <Height>10</Height>
+    <Square width="13.0" depth="8.0"/>
+    <Height>10.0</Height>
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Zabal Horma</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="7"/>
+    <Static width="12.0" depth="7.0"/>
   </Obstruction>
   <StatusBars>
-    <HeightOffset>11</HeightOffset>
+    <HeightOffset>11.0</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>9</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/iberians/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="6"/>
+    <Square width="13.0" depth="6.0"/>
     <Height>12.6</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>sbty</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="5"/>
+    <Static width="12.0" depth="5.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>13.6</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>11.6</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/kushites/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="6"/>
+    <Square width="13.0" depth="6.0"/>
     <Height>12.5</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="5"/>
+    <Static width="12.0" depth="5.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>13.5</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>11.5</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/hellenes/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
@@ -7,7 +7,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="13" depth="5"/>
+    <Square width="13.0" depth="5.0"/>
     <Height>10.5</Height>
   </Footprint>
   <Identity>
@@ -19,11 +19,20 @@
     <stone>0</stone>
   </Loot>
   <Obstruction>
-    <Static width="12" depth="4"/>
+    <Static width="12.0" depth="4.0"/>
   </Obstruction>
   <StatusBars>
-    <HeightOffset>18</HeightOffset>
+    <HeightOffset>18.0</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>9.5</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/mauryas/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="7"/>
+    <Square width="13.0" depth="7.0"/>
     <Height>11.6</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Para</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="6"/>
+    <Static width="12.0" depth="6.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>12.6</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>10.6</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/persians/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="16" depth="6"/>
+    <Square width="16.0" depth="6.0"/>
     <Height>10.8</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="15" depth="5"/>
+    <Static width="15.0" depth="5.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>11.8</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>9.8</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/ptolemies/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
@@ -20,7 +20,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="13" depth="5"/>
+    <Square width="13.0" depth="5.0"/>
     <Height>6.7</Height>
   </Footprint>
   <Health>
@@ -40,12 +40,21 @@
     <stone>0</stone>
   </Loot>
   <Obstruction>
-    <Static width="12" depth="4"/>
+    <Static width="12.0" depth="4.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>7.7</HeightOffset>
   </StatusBars>
   <TerritoryInfluence disable=""/>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>5.7</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/romans/siege_wall_short.xml</Actor>
     <FoundationActor>structures/fndn_1x1.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="9"/>
+    <Square width="13.0" depth="9.0"/>
     <Height>9.9</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Moenia</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="8"/>
+    <Static width="12.0" depth="8.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>10.9</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>8.9</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/romans/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="12" depth="6"/>
+    <Square width="12.0" depth="6.0"/>
     <Height>11.4</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="11" depth="5"/>
+    <Static width="11.0" depth="5.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>12.4</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>10.4</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/seleucids/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Footprint>
-    <Square width="13" depth="6"/>
+    <Square width="13.0" depth="6.0"/>
     <Height>12.5</Height>
   </Footprint>
   <Identity>
@@ -9,11 +9,20 @@
     <SpecificName>Teichos</SpecificName>
   </Identity>
   <Obstruction>
-    <Static width="12" depth="5"/>
+    <Static width="12.0" depth="5.0"/>
   </Obstruction>
   <StatusBars>
     <HeightOffset>13.5</HeightOffset>
   </StatusBars>
+  <TurretHolder>
+    <TurretPoints>
+      <One>
+        <X>0</X>
+        <Y>11.5</Y>
+        <Z>0</Z>
+      </One>
+    </TurretPoints>
+  </TurretHolder>
   <VisualActor>
     <Actor>structures/hellenes/wall_short.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall">
+  <Auras datatype="tokens">
+    structures/wall_garrisoned
+  </Auras>
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
       <stone>12</stone>
     </Resources>
   </Cost>
+  <GarrisonHolder>
+    <Max>1</Max>
+    <List datatype="tokens">Ranged+Infantry</List>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
   <Health>
     <Max>1000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_short</SpawnEntityOnDeath>
@@ -14,7 +25,6 @@
     <stone>3</stone>
   </Loot>
   <ProductionQueue disable=""/>
-  <RallyPoint disable=""/>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3_wall.xml</FoundationActor>
   </VisualActor>