Index: /IBBoard.WarFoundry.API/trunk/AssemblyInfo.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/AssemblyInfo.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/AssemblyInfo.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Factories/Xml/WarFoundryXmlSaver.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Factories/Xml/WarFoundryXmlSaver.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Factories/Xml/WarFoundryXmlSaver.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Factories/Xml/WarFoundryXmlFactory.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Factories/Xml/WarFoundryXmlFactory.cs	(revision 87)
+++ /IBBoard.WarFoundry.API/trunk/api/Factories/Xml/WarFoundryXmlFactory.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Factories/AbstractNativeWarFoundryFactory.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Factories/AbstractNativeWarFoundryFactory.cs	(revision 59)
+++ /IBBoard.WarFoundry.API/trunk/api/Factories/AbstractNativeWarFoundryFactory.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Commands/SetNameCommand.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Commands/SetNameCommand.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Commands/SetNameCommand.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Commands/RemoveUnitCommand.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Commands/RemoveUnitCommand.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Commands/RemoveUnitCommand.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Commands/CreateAndAddUnitCommand.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Commands/CreateAndAddUnitCommand.cs	(revision 94)
+++ /IBBoard.WarFoundry.API/trunk/api/Commands/CreateAndAddUnitCommand.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Commands/ReplaceUnitEquipmentCommand.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Commands/ReplaceUnitEquipmentCommand.cs	(revision 89)
+++ /IBBoard.WarFoundry.API/trunk/api/Commands/ReplaceUnitEquipmentCommand.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Commands/SetUnitSizeCommand.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Commands/SetUnitSizeCommand.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Commands/SetUnitSizeCommand.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Commands/SetUnitEquipmentAmountCommand.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Commands/SetUnitEquipmentAmountCommand.cs	(revision 89)
+++ /IBBoard.WarFoundry.API/trunk/api/Commands/SetUnitEquipmentAmountCommand.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Delegates.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Delegates.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Delegates.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequirementItem.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequirementItem.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequirementItem.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/RequirementAND.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/RequirementAND.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/RequirementAND.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/AbstractRequirement.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/AbstractRequirement.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/AbstractRequirement.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/AbstractFailedRequirement.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/AbstractFailedRequirement.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/AbstractFailedRequirement.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/Delegates.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/Delegates.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/Delegates.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitExcludesRequirement.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitExcludesRequirement.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitExcludesRequirement.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequiresAtLeastRequirement.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequiresAtLeastRequirement.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequiresAtLeastRequirement.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequirement.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequirement.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitRequirement.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/RequirementOR.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/RequirementOR.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/RequirementOR.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/FailedUnitRequirement.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/FailedUnitRequirement.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/FailedUnitRequirement.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitMinNumberReached.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitMinNumberReached.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitMinNumberReached.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitExclusion.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitExclusion.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitExclusion.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitMaxNumberReached.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitMaxNumberReached.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Requirements/UnitMaxNumberReached.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/Stat.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/Stat.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/Stat.cs	(revision 143)
@@ -27,4 +27,9 @@
 		}
 
+		public string ParentSlotName
+		{
+			get { return ParentSlot.Name; }
+		}
+
 		public string SlotValueString
 		{
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/Category.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/Category.cs	(revision 81)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/Category.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/StatSlot.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/StatSlot.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/StatSlot.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/GameSystem.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/GameSystem.cs	(revision 86)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/GameSystem.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/Unit.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/Unit.cs	(revision 131)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/Unit.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/UnitType.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/UnitType.cs	(revision 131)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/UnitType.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/UnitEquipmentItem.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/UnitEquipmentItem.cs	(revision 123)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/UnitEquipmentItem.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/EquipmentItem.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/EquipmentItem.cs	(revision 89)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/EquipmentItem.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/WarFoundryObject.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/WarFoundryObject.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/WarFoundryObject.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/IWarFoundryObject.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/IWarFoundryObject.cs	(revision 29)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/IWarFoundryObject.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/SystemStats.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/SystemStats.cs	(revision 108)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/SystemStats.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/ArmyCategory.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/ArmyCategory.cs	(revision 94)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/ArmyCategory.cs	(revision 143)
@@ -67,4 +67,5 @@
 		internal void AddUnit(Unit unit)
 		{
+			List<FailedUnitRequirement> failedReqs = ParentArmy.CanAddUnit(unit);
 			units.Add(unit);
 			unit.Category = this;
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/Army.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/Army.cs	(revision 95)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/Army.cs	(revision 143)
@@ -161,9 +161,7 @@
 		public void AddUnit(Unit unit)
 		{
-			List<FailedUnitRequirement> failedReqs = CanAddUnit(unit);
 			unit.Army = this;
 			ArmyCategory armyCat = GetCategory(unit.UnitType.MainCategory);
 			armyCat.AddUnit(unit);
-			OnUnitAdded(unit, failedReqs);
 		}
 		
@@ -172,6 +170,5 @@
 			List<FailedUnitRequirement> failedReqs = CanRemoveUnit(unit);
 			unit.Army = null;
-			ArmyCategory armyCat = GetCategory(unit.UnitType.MainCategory);
-			armyCat.RemoveUnit(unit);
+			unit.Category.RemoveUnit(unit);
 			OnUnitRemoved(unit, failedReqs);
 		}
Index: /IBBoard.WarFoundry.API/trunk/api/Objects/Race.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/Objects/Race.cs	(revision 91)
+++ /IBBoard.WarFoundry.API/trunk/api/Objects/Race.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/WarFoundryLoader.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/WarFoundryLoader.cs	(revision 76)
+++ /IBBoard.WarFoundry.API/trunk/api/WarFoundryLoader.cs	(revision 143)
Index: /IBBoard.WarFoundry.API/trunk/api/WarFoundryCore.cs
===================================================================
--- /IBBoard.WarFoundry.API/trunk/api/WarFoundryCore.cs	(revision 73)
+++ /IBBoard.WarFoundry.API/trunk/api/WarFoundryCore.cs	(revision 143)