--- a/api/Objects/UnitType.cs	Sun Apr 25 15:07:08 2010 +0000
+++ b/api/Objects/UnitType.cs	Mon Apr 26 19:49:51 2010 +0000
@@ -195,28 +195,59 @@
 		}
 
 		/// <value>
-		/// The set of <see cref="Stat"/>s for the unit in a format that is valid for the game system.
+		/// The first of the <see cref="Stat"/>s lines for the unit.
 		/// </value>
+		[Obsolete("Use UnitStatsArrays instead")]
 		public Stat[] UnitStatsArray
 		{
 			get
 			{
-				Stat[] statsArray = null;
+				return UnitStatsArrays[0];
+			}
+		}
+
+		//// <value>
+		/// The first ot the <see cref="Stat"/>s lines for the unit including an additional column that contains the unit type name
+		/// </value>
+		[Obsolete("Use UnitStatsArrays instead")]
+		public Stat[] UnitStatsArrayWithName
+		{
+			get
+			{				
+				return UnitStatsArraysWithName[0];
+			}
+		}
+		
+		/// <value>
+		/// The array of <see cref="Stat"/>s for each of the unit's stat lines
+		/// </value>
+		public Stat[][] UnitStatsArrays
+		{
+			get
+			{
+				Stat[][] statsArray = null;
 				
 				if (stats != null)
 				{
-					statsArray = stats.StatsArray;
+					statsArray = new Stat[][]{ stats.StatsArray };
 				}
 				else if (unitMemberTypes.Count > 0)
 				{
-					UnitMemberType[] memberTypeArray = DictionaryUtils.ToArray(unitMemberTypes);
-					statsArray = memberTypeArray[0].StatsArray;
+					int memTypeCount = unitMemberTypes.Count;
+					statsArray = new Stat[memTypeCount][];
+					int i = 0;
+					
+					foreach (UnitMemberType memType in unitMemberTypes.Values)
+					{
+						statsArray[i] = memType.StatsArray;
+						i++;
+					}
 				}
 				else
 				{
 					SystemStats systemStats = GameSystem.StandardSystemStats;
 					Stats tempStats = new Stats(systemStats);				
-					statsArray = tempStats.StatsArray;
+					statsArray = new Stat[][]{ tempStats.StatsArray };
 				}
 				
 				return statsArray;
@@ -224,28 +255,35 @@
 		}
 
 		//// <value>
-		/// The set of <see cref="Stat"/>s for the unit including an additional column that contains the unit type name
+		/// The array of <see cref="Stat"/>s for each of the unit's stat lines including an additional column that contains the unit type name
 		/// </value>
-		public Stat[] UnitStatsArrayWithName
+		public Stat[][] UnitStatsArraysWithName
 		{
 			get
 			{				
-				Stat[] statsArray = null;
+				Stat[][] statsArray;
 				
 				if (stats != null)
 				{
-					statsArray = ExtendStatsArrayWithName(stats.StatsArray);
+					statsArray = new Stat[][]{ ExtendStatsArrayWithName(stats.StatsArray) };
 				}
 				else if (unitMemberTypes.Count > 0)
 				{
-					UnitMemberType[] memberTypeArray = DictionaryUtils.ToArray(unitMemberTypes);
-					statsArray = memberTypeArray[0].StatsArrayWithName;
+					int memTypeCount = unitMemberTypes.Count;
+					statsArray = new Stat[memTypeCount][];
+					int i = 0;
+					
+					foreach (UnitMemberType memType in unitMemberTypes.Values)
+					{
+						statsArray[i] = memType.StatsArrayWithName;
+						i++;
+					}
 				}
 				else
 				{
 					SystemStats systemStats = GameSystem.StandardSystemStats;
 					Stats tempStats = new Stats(systemStats);				
-					statsArray = ExtendStatsArrayWithName(tempStats.StatsArray);
+					statsArray = new Stat[][]{ ExtendStatsArrayWithName(tempStats.StatsArray) };
 				}
 				
 				return statsArray;