diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml
index f1fc41a8c0..1a8a484461 100755
--- a/binaries/data/mods/official/entities/template_entity.xml
+++ b/binaries/data/mods/official/entities/template_entity.xml
@@ -20,7 +20,6 @@
 
 		<!-- Defaults to no armour. -->
 		<Armour>
- 			<Value>0.0</Value>
  			<Crush>0.0</Crush>
  			<Hack>0.0</Hack>
  			<Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/official/entities/template_structure.xml b/binaries/data/mods/official/entities/template_structure.xml
index 4b78d8e041..48e97a942e 100644
--- a/binaries/data/mods/official/entities/template_structure.xml
+++ b/binaries/data/mods/official/entities/template_structure.xml
@@ -31,6 +31,12 @@
 			<BarHeight>12.0</BarHeight>
 			<Repairable />
 		</Health>
+		
+		<Armour>
+			<Hack>20.0</Hack>
+			<Pierce>20.0</Pierce>
+			<Crush>0.0</Crush>
+		</Armour>
 
 		<Vision>
 			<Los>9</Los>
diff --git a/binaries/data/mods/official/entities/template_unit.xml b/binaries/data/mods/official/entities/template_unit.xml
index 798186bc53..4ad963e351 100644
--- a/binaries/data/mods/official/entities/template_unit.xml
+++ b/binaries/data/mods/official/entities/template_unit.xml
@@ -27,6 +27,9 @@
 			<Height>4.0</Height>
 		</Footprint>
 		
+		<Armour>
+			<Crush>1000.0</Crush>
+		</Armour>
 		
 		<Formation>
   			<Category>Melee</Category>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry.xml b/binaries/data/mods/official/entities/template_unit_cavalry.xml
index c146f9f956..aaad3883cf 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry.xml
@@ -16,10 +16,9 @@
 
 
 		<Armour>
-			<Value>4</Value>
-			<Crush>0.0</Crush>
-			<Hack>0.75</Hack>
-			<Pierce>0.25</Pierce>
+			<Hack>3.0</Hack>
+			<Pierce>1.0</Pierce>
+			<Crush>1000.0</Crush>
 		</Armour>
 
 		<Footprint>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml
index 64f6767d17..7d40a9460e 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml
@@ -18,10 +18,11 @@
 				<Radius>5</Radius>
 				<Speed>1000</Speed>
 				<Duration>3</Duration>
-				<Damage>20.0</Damage>
+				
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				<Hack>10.0</Hack>
+				<Pierce>10.0</Pierce>
+				
 				<r>1.0</r>
 				<g>0.1</g>
 				<b>0.2</b>
@@ -34,19 +35,19 @@
 	<Actions>
 		<Attack>
 			<Melee>
-				<Damage>10.0</Damage>
+				<Hack>5.0</Hack>
+				<Pierce>5.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				
 				<Range>2.0</Range>
 				<Speed>1500</Speed>
 			</Melee>
 		
 			<Charge>
-				<Damage>20.0</Damage>
+				<Hack>10.0</Hack>
+				<Pierce>10.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				
 				<Range>2.0</Range>
 				<Speed>1500</Speed>
 			</Charge>	
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged.xml
index 012f1fd5d4..f5fd848a16 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged.xml
@@ -17,10 +17,9 @@
 	<Actions>
 		<Attack>
 			<Ranged>
-				<Damage>10.0</Damage>
+				<Hack>0.0</Hack>
+				<Pierce>10.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
 				<Range>16.0</Range>
 				<Speed>1500</Speed>
 			</Ranged>
diff --git a/binaries/data/mods/official/entities/template_unit_hero.xml b/binaries/data/mods/official/entities/template_unit_hero.xml
index 71875021df..2ec4b7975f 100644
--- a/binaries/data/mods/official/entities/template_unit_hero.xml
+++ b/binaries/data/mods/official/entities/template_unit_hero.xml
@@ -20,10 +20,9 @@
 		</Creation>
 		
 		<Armour>
-			<Value>0</Value>
-			<Crush>0.3</Crush>
-			<Hack>0.3</Hack>
-			<Pierce>0.3</Pierce>
+			<Hack>3.0</Hack>
+			<Pierce>3.0</Pierce>
+			<Crush>1000.0</Crush>
 		</Armour>	
 
 		<Health>
@@ -47,19 +46,19 @@
 	<Actions>
 		<Attack>
 			<Melee>
-				<Damage>20.0</Damage>
-				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>		
+				<Hack>15.0</Hack>
+				<Pierce>15.0</Pierce>
+				
+				<Crush>0.0</Crush>	
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Melee>
 		
 			<Charge>
-				<Damage>40.0</Damage>
-				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>		
+				<Hack>25.0</Hack>
+				<Pierce>25.0</Pierce>
+				
+				<Crush>0.0</Crush>		
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Charge>		
diff --git a/binaries/data/mods/official/entities/template_unit_infantry.xml b/binaries/data/mods/official/entities/template_unit_infantry.xml
index 348f3464a3..58ed102e84 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry.xml
@@ -10,14 +10,11 @@
 
 			<Classes>Military, Foot, Organic, CitizenSoldier, Worker</Classes>
 		</Id>
-
-
 		
 		<Armour>
-			<Value>4</Value>
-			<Crush>0.0</Crush>
-			<Hack>0.75</Hack>
-			<Pierce>0.25</Pierce>
+			<Hack>2.0</Hack>
+			<Pierce>2.0</Pierce>
+			<Crush>1000.0</Crush>
 		</Armour>
 		
 		<Health>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee.xml
index 2a603a54a2..9548a18e1e 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee.xml
@@ -19,23 +19,20 @@
 	<Actions>
 		<Attack>
 			<Melee>
-				<Damage>10.0</Damage>
-				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>		
+				<Hack>5.0</Hack>
+				<Pierce>5.0</Pierce>	
+				<Crush>0.0</Crush>	
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Melee>
 
 			<Charge>
-				<Damage>10.0</Damage>
-				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>		
+				<Hack>7.5</Hack>
+				<Pierce>7.5</Pierce>	
+				<Crush>0.0</Crush>	
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Charge>
 		</Attack>
 	</Actions>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml
index ecb129bd54..12d1b266e7 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml
@@ -22,10 +22,9 @@
 	<Actions>
 		<Attack>
 			<Ranged>
-				<Damage>10.0</Damage>
+				<Hack>0.0</Hack>
+				<Pierce>10.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
 				<Range>24.0</Range>
 				<Speed>1500</Speed>
 				<ProjectileSpeed>12.0</ProjectileSpeed>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
index 25f2ac28de..ddd1e53d56 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
@@ -23,10 +23,9 @@
 	<Actions>
 		<Attack>
 			<Charge>
-				<Damage>20.0</Damage>
-				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				<Hack>0.0</Hack>
+				<Pierce>0.0</Pierce>
+				<Crush>100.0</Crush>
 				<Range>2.0</Range>
 				<Speed>1500</Speed>
 			</Charge>	
diff --git a/binaries/data/mods/official/entities/template_unit_super.xml b/binaries/data/mods/official/entities/template_unit_super.xml
index 6e28309245..d8247050e8 100644
--- a/binaries/data/mods/official/entities/template_unit_super.xml
+++ b/binaries/data/mods/official/entities/template_unit_super.xml
@@ -30,28 +30,28 @@
 	<Actions>
 		<Attack>
 			<Melee>
-				<Damage>15.0</Damage>
+				<Hack>10.0</Hack>
+				<Pierce>10.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Melee>
 		
 			<Charge>
-				<Damage>30.0</Damage>
+				<Hack>15.0</Hack>
+				<Pierce>15.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Charge>	
 
 			<Ranged>
-				<Damage>10.0</Damage>
+				<Hack>0.0</Hack>
+				<Pierce>20.0</Pierce>
 				<Crush>0.0</Crush>
-				<Hack>0.5</Hack>
-				<Pierce>0.5</Pierce>
+				
 				<Range>24.0</Range>
 				<Speed>1500</Speed>
 			</Ranged>
diff --git a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
index a6f1549f19..7f223ac720 100644
--- a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
@@ -25,10 +25,11 @@
 				<Radius>1</Radius>
 				<Speed>1000</Speed>
 				<Duration>3</Duration>
-				<Damage>50</Damage>
-				<Crush>0</Crush>
-				<Hack>0.9</Hack>
-				<Pierce>0.1</Pierce>
+				
+				<Crush>0.0</Crush>
+				<Hack>20.0</Hack>
+				<Pierce>5.0</Pierce>
+				
 				<r>1.0</r>
 				<g>0.1</g>
 				<b>0.2</b>
diff --git a/binaries/data/mods/official/scripts/entity_functions.js b/binaries/data/mods/official/scripts/entity_functions.js
index b7b26cb414..aea7253f4e 100644
--- a/binaries/data/mods/official/scripts/entity_functions.js
+++ b/binaries/data/mods/official/scripts/entity_functions.js
@@ -575,17 +575,17 @@ function performAttack( evt )
 	{
 		console.write("" + this + " doing a charge attack!");
 		var a = this.actions.attack.charge;
-		dmg.crush = a.damage * a.crush;
-		dmg.hack = a.damage * a.hack;
-		dmg.pierce = a.damage * a.pierce;
+		dmg.crush = a.crush;
+		dmg.hack = a.hack;
+		dmg.pierce = a.pierce;
 		this.setRun( false );
 	}
 	else
 	{
 		var a = this.actions.attack.melee;
-		dmg.crush = a.damage * a.crush;
-		dmg.hack = a.damage * a.hack;
-		dmg.pierce = a.damage * a.pierce;
+		dmg.crush = a.crush;
+		dmg.hack = a.hack;
+		dmg.pierce = a.pierce;
 	}
 	
 	// Add flank penalty
@@ -610,9 +610,9 @@ function performAttackRanged( evt )
 	// Create a projectile from us, to the target, that will do some damage when it hits them.
 	dmg = new DamageType();
 	var a = this.actions.attack.ranged;
-	dmg.crush = a.damage * a.crush;
-	dmg.hack = a.damage * a.hack;
-	dmg.pierce = a.damage * a.pierce;
+	dmg.crush = a.crush;
+	dmg.hack = a.hack;
+	dmg.pierce = a.pierce;
 	
 	// Add flank penalty and elevation bonus
 	var bonus = 1.0;
@@ -1882,7 +1882,9 @@ function DamageModifyAura( source, ally, bonus )
 		if( this.affects( e ) ) 
 		{
 			//console.write( "DamageModify aura: giving " + this.bonus + " damage to " + e );
-			e.actions.attack.damage += this.bonus;
+			e.actions.attack.crush += this.bonus;
+			e.actions.attack.pierce += this.bonus;
+			e.actions.attack.hack += this.bonus;
 		}
 	};
 	
@@ -1891,7 +1893,9 @@ function DamageModifyAura( source, ally, bonus )
 		if( this.affects( e ) ) 
 		{
 			//console.write( "DamageModify aura: taking away " + this.bonus + " damage from " + e );
-			e.actions.attack.damage -= this.bonus;
+			e.actions.attack.crush -= this.bonus;
+			e.actions.attack.pierce -= this.bonus;
+			e.actions.attack.hack -= this.bonus;
 		}
 	};
 }
@@ -2075,9 +2079,9 @@ function TrampleAura( source )
 			// Set up the damage object
 			var dmg = new DamageType();
 			var a = this.source.traits.auras.trample;
-			dmg.crush = parseInt(a.damage * a.crush);
-			dmg.hack = parseInt(a.damage * a.hack);
-			dmg.pierce = parseInt(a.damage * a.pierce);
+			dmg.crush = parseInt(a.crush);
+			dmg.hack = parseInt(a.hack);
+			dmg.pierce = parseInt(a.pierce);
 
 			// Add flank bonus
 			if(e.traits.flankPenalty)