Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -62,7 +62,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStables, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Axeman, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStables, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
@@ -32,6 +32,7 @@
       -units/{civ}_infantry_javelinist_b
       -units/{civ}_infantry_slinger_b
       -units/{civ}_infantry_archer_b
+      units/{civ}_cavalry_axeman_b
     </Entities>
     <Technologies datatype="tokens">
       -training_conscription
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_melee">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>2</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>7.5</Hack>
+      <Pierce>0</Pierce>
+      <Crush>1.5</Crush>
+      <MaxRange>6.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+      <metal>10</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <GenericName>Cavalry Axeman</GenericName>
+  </Identity>
+  <Loot>
+    <wood>0</wood>
+    <metal>5</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.2</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry">
+  <Armour>
+    <Pierce op="add">1</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>15</Hack>
+      <Pierce>0</Pierce>
+      <Crush>5</Crush>
+      <MaxRange>6.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>300</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Champion Cavalry Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.2</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry">
+  <Armour>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">1</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>12</Hack>
+      <Pierce>0</Pierce>
+      <Crush>4</Crush>
+      <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+      <metal>75</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Champion Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.4</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.4</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Attack>
+    <Melee>
+     <Hack>30.0</Hack>
+     <Pierce>0.0</Pierce>
+     <Crush>10.0</Crush>
+     <MaxRange>6.0</MaxRange>
+     <PrepareTime>500</PrepareTime>
+     <RepeatTime>1000</RepeatTime>
+     <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Hero Cavalry Axeman</GenericName>
+  </Identity>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Armour>
+    <Hack op="add">3</Hack>
+    <Pierce op="add">3</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>24</Hack>
+      <Pierce>0</Pierce>
+      <Crush>8</Crush>
+      <MaxRange>5.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Hero Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.05</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee">
+  <Armour>
+    <Hack>4</Hack>
+    <Pierce>4</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>6</Hack>
+      <Pierce>0</Pierce>
+      <Crush>2</Crush>
+      <MaxRange>2.0</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+      <metal>10</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <GenericName>Axeman</GenericName>
+  </Identity>
+  <Loot>
+    <metal>5</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.05</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="template_unit_champion_infantry_axeman">
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ‘Iprmk</SpecificName>
-    <VisibleClasses datatype="tokens">Axe</VisibleClasses>
     <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b">
+<Entity parent="units/pers_cavalry_axeman_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e</Entity>
+    <Entity>units/pers_cavalry_axeman_e</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/cavalry_swordsman_a.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a">
+<Entity parent="units/pers_cavalry_axeman_a">
   <Identity>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e_trireme</Entity>
+    <Entity>units/pers_cavalry_axeman_e_trireme</Entity>
   </Promotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_melee_axeman">
   <Identity>
     <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_swordsman_b</SelectionGroupName>
+    <SelectionGroupName>units/pers_cavalry_axeman_b</SelectionGroupName>
     <GenericName>Hyrcanian Cavalry</GenericName>
     <SpecificName>Varkaniya Asabara</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
+    <Icon>units/pers_cavalry_axeman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a</Entity>
+    <Entity>units/pers_cavalry_axeman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/cavalry_swordsman_b_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b">
+<Entity parent="units/pers_cavalry_axeman_b">
   <Identity>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a_trireme</Entity>
+    <Entity>units/pers_cavalry_axeman_a_trireme</Entity>
   </Promotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a">
+<Entity parent="units/pers_cavalry_axeman_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_e">
+<Entity parent="units/pers_cavalry_axeman_e">
   <Identity>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
@@ -13,7 +13,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers_cavalry_swordsman_b_trireme
+      units/pers_cavalry_axeman_b_trireme
       units/pers_cavalry_javelinist_b_trireme
     </Entities>
     <TechCostMultiplier>