--- a/api/Objects/Unit.cs	Thu Apr 09 13:58:23 2009 +0000
+++ b/api/Objects/Unit.cs	Thu Apr 09 14:17:53 2009 +0000
@@ -21,7 +21,8 @@
 		private Race race;
 		private double points;
 		private ArmyCategory cat;
-		private Dictionary<UnitEquipmentItem, double> equipment = new Dictionary<UnitEquipmentItem, double>();
+		private Dictionary<UnitEquipmentItem, double> equipment = new Dictionary<UnitEquipmentItem, double>();
+		private List<Unit> containedUnits = new List<Unit>();
 		public event DoubleValChangedDelegate PointsValueChanged;
 		public event IntValChangedDelegate UnitSizeChanged;
 		public event DoubleValChangedDelegate UnitEquipmentAmountChanged;
@@ -195,6 +196,31 @@
 
 				return points;
 			}
+		}
+		
+		public Unit[] ContainedUnits
+		{
+			get { return containedUnits.ToArray(); }
+		}
+		
+		public void AddContainedUnit(Unit unit)
+		{
+			if (UnitType.CanContainUnit(unit))
+			{
+				if (!containedUnits.Contains(unit))
+				{
+					containedUnits.Add(unit);
+				}
+			}
+			else
+			{
+				throw new InvalidContainershipException(this, unit);
+			}
+		}
+		
+		public void RemoveContainedUnit(Unit unit)
+		{
+			containedUnits.Remove(unit);
 		}
 
 		public UnitEquipmentItem[] GetAllowedOptionalEquipment()