--- a/MainWindow.cs	Tue Aug 03 19:36:49 2010 +0000
+++ b/MainWindow.cs	Wed Aug 04 19:37:23 2010 +0000
@@ -145,7 +145,7 @@
 		}		
 
 		private void HandleWarFoundryCoreArmyChanged(Army oldValue, Army newValue)
-		{
+		{			
 			CommandStack.Reset();
 			loadedFilePath = null;
 			layout.actionSaveArmy.Enabled = false;
@@ -153,7 +153,7 @@
 			SetPointsPanelText();
 			SetAppTitle();
 		}
-
+		
 		private void SetPointsPanelText ()
 		{
 			//TODO: implement panel and points panel
@@ -375,9 +375,19 @@
 			if (unitObj is Unit)
 			{
 				Unit unit = (Unit)unitObj;
+				QStandardItemModel treeModel = (QStandardItemModel)layout.armyTree.Model();
+				List<QStandardItem> items = treeModel.FindItems(unit.Category.Name, (uint)MatchFlag.MatchExactly, 0);
+				
+				if (items.Count == 1)
+				{
+					QStandardItem item = items[0];
+					CreateTreeSubItem(unit, item);
+					layout.armyTree.Expand(item.Index());
+				}
+				//Else something odd happened and we need to handle it
+				
 				//TODO set error panel
 				//sbErrorPanel.Text = "";
-				//TODO add unit to tree
 			}
 		}
 
@@ -461,7 +471,7 @@
 			FillArmyTree(newArmy);
 		}
 
-		private void FillArmyTree (Army army)
+		private void FillArmyTree(Army army)
 		{
 			QStandardItemModel treeModel = new QStandardItemModel();
 			List<string> headers = new List<string>();