diff --git a/binaries/data/mods/official/entities/formations/BoxForm2.xml b/binaries/data/mods/official/entities/formations/BoxForm2.xml
new file mode 100644
index 0000000000..c3606387b4
--- /dev/null
+++ b/binaries/data/mods/official/entities/formations/BoxForm2.xml
@@ -0,0 +1,51 @@
+
+<formation Tag="Form Box 2"
+   bonus="actions.move.speed"
+   bonustype="sword"
+   bonusval=".2"
+   penalty=""
+   penaltytype=""
+   penaltyval=""
+   required="10"
+   next="BoxForm3"
+   prior="BoxForm1"
+   movement="Group Line"
+   rankspacing="5.0f"
+   filespacing="5.0f"
+>
+   <fl category="Melee">
+     <rk order="1"></rk>
+     <rk order="10"></rk>
+     <rk order="2"></rk>
+     <rk order="11"></rk>
+     <rk order="3"></rk>
+   </fl>
+   <fl category="Melee">
+     <rk order="12"></rk>
+     <rk category="Melee, Ranged" order="18"></rk>
+     <rk category="Melee, Ranged" order="22"></rk>
+     <rk category="Melee, Ranged" order="19"></rk>
+     <rk order="13"></rk>
+   </fl>
+   <fl category="Melee">
+     <rk order="4"></rk>
+     <rk category="Melee, Ranged" order="23"></rk>
+     <rk category="Support, Lead, Ranged" order="5"></rk>
+     <rk category="Melee, Ranged" order="24"></rk>
+     <rk order="6"></rk>
+   </fl>
+   <fl category="melee">
+     <rk order="14"></rk>
+     <rk category="Melee, Ranged" order="20"></rk>
+     <rk category="Melee, Ranged" order="25"></rk>
+     <rk category="Melee, Ranged" order="21"></rk>
+     <rk order="15"></rk>
+   </fl>
+   <fl category="Melee">
+     <rk order="7"></rk>
+     <rk order="16"></rk>
+     <rk order="8"></rk>
+     <rk order="17"></rk>
+     <rk order="9"></rk>
+   </fl>
+</formation>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml
index 130f3f0015..2ea792391d 100755
--- a/binaries/data/mods/official/entities/template_entity.xml
+++ b/binaries/data/mods/official/entities/template_entity.xml
@@ -34,6 +34,11 @@
 			<Bar_Height>-1.0</Bar_Height>
 			<Bar_Size>20</Bar_Size>
 		</Stamina>
+		<Rank>
+			<Height>7.0</Height>
+			<Size>17</Size>
+			<Name></Name>
+		</Rank>
 
 	</Traits>
 
diff --git a/binaries/data/mods/official/entities/template_entity_full.xml b/binaries/data/mods/official/entities/template_entity_full.xml
index 2986f1515b..3e3713de0a 100644
--- a/binaries/data/mods/official/entities/template_entity_full.xml
+++ b/binaries/data/mods/official/entities/template_entity_full.xml
@@ -20,5 +20,6 @@
 	<Event On="Generic" Function="entityEventGeneric" />
 	<Event On="TargetChanged" Function="entityEventTargetChanged" />
 	<Event On="Notification" Function="entityEventNotification" />
+	<Event On="Formation" Function="entityEventFormation" />
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_entity_script.js b/binaries/data/mods/official/entities/template_entity_script.js
index 545187ff64..887e4b823e 100644
--- a/binaries/data/mods/official/entities/template_entity_script.js
+++ b/binaries/data/mods/official/entities/template_entity_script.js
@@ -742,6 +742,7 @@ function entityEventTargetChanged( evt )
 	// If we can gather, and the target supplies, gather. If it's our enemy, and we're armed, attack. 
 	// If all else fails, move (or run on a right-click).
 	
+	
 	evt.defaultOrder = NMT_Goto;
 	evt.defaultCursor = "arrow-default";
 	evt.defaultAction = ACTION_NONE;
@@ -1312,3 +1313,32 @@ function GotoInRange( x, y, run )
 	else
 		this.order( ORDER_GOTO, x, y - this.actions.escort.distance, true);
 }
+function entityEventFormation( evt )
+{
+	if ( evt.formationEvent == FORMATION_ENTER )
+	{
+		if ( this.getFormationBonus() && this.isInClass( this.getFormationBonusType() ) )
+		{
+			eval( this + this.getFormationBonus() ) += eval( this + this.getFormationBonus() ) *		
+				 this.getFormationBonusVal();
+		}
+		if ( this.getFormationPenalty() && this.isInClass( this.getFormationPenaltyType() ) )
+		{
+			eval( this + this.getFormationPenalty() ) -= eval( this + this.getFormationbonus() ) *
+				this.getFormationPenaltyVal();
+		}
+	}
+	//Reverse the bonuses
+	else if ( evt.formationEvent == FORMATION_LEAVE )
+	{
+		if ( this.getFormationBonus() && this.isInClass( this.getFormationBonusType() ) )
+		{
+			eval( this + this.getFormationBonus() ) -= eval( this + this.getFormationBonus() ) *						 this.getFormationBonusVal();
+		}
+		if ( this.getFormationPenalty() && this.isInClass( this.getFormationPenaltyType() ) )
+		{
+			eval( this + this.getFormationPenalty() ) += eval( this + this.getFormationbonus() ) *
+				this.getFormationPenaltyVal();
+		}
+	}	
+}
\ No newline at end of file
diff --git a/binaries/data/mods/official/gui/test/functions_sim_entity.js b/binaries/data/mods/official/gui/test/functions_sim_entity.js
index 840b568be5..e2c8d7f707 100644
--- a/binaries/data/mods/official/gui/test/functions_sim_entity.js
+++ b/binaries/data/mods/official/gui/test/functions_sim_entity.js
@@ -70,6 +70,7 @@ function worldClickHandler(event)
 			else
 				args[1]=event.secondaryAction;
 		break;
+		//TODO:  get rid of order() calls.
 		case NMT_NotifyRequest:
 			if (event.clicks == 1)
 				action = event.action;
@@ -78,8 +79,10 @@ function worldClickHandler(event)
 			
 			if (event.entity.isIdle())
 			{
-				for (i=0; i<selection.length;i++)			
+				for (var i=0; i<selection.length;i++)			
 				{
+					if (!selection[i].actions)
+						continue;
 					console.write("Requesting notification for " + event.entity);
 					selection[i].requestNotification( event.entity, action, true );
 					selection[i].order( ORDER_GOTO, event.entity.position.x, event.entity.position.z -							selection[i].actions.escort.distance, true);
@@ -87,8 +90,10 @@ function worldClickHandler(event)
 			}
 			else
 			{
-				for (i=0; i<selection.length;i++)	
+				for (var i=0; i<selection.length;i++)	
 				{
+					if (!selection[i].actions)
+						continue;
 					console.write("Requesting notification for " + event.entity);		
 					selection[i].requestNotification( event.entity, action, true );
 				}