--- a/FrmMain.cs	Sat Mar 06 16:33:28 2010 +0000
+++ b/FrmMain.cs	Sat Mar 06 21:09:02 2010 +0000
@@ -1,1364 +1,1333 @@
-// This file (FrmMain.cs) is a part of the IBBoard.WarFoundry.GUI.WinForms project and is copyright 2007, 2008, 2009 IBBoard.
-//
-// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Data;
-using System.IO;
-using System.Threading;
-using log4net;
-using IBBoard;
-using IBBoard.CustomMath;
-using IBBoard.Commands;
-using IBBoard.IO;
-using IBBoard.Lang;
-using IBBoard.Windows.Forms;
-using IBBoard.Windows.Forms.I18N;
-using IBBoard.Xml;
-using IBBoard.WarFoundry.API;
-using IBBoard.WarFoundry.API.Commands;
-using IBBoard.WarFoundry.API.Exporters;
-using IBBoard.WarFoundry.API.Objects;
-using IBBoard.WarFoundry.API.Savers;
-using IBBoard.WarFoundry.API.Factories;
-using IBBoard.WarFoundry.API.Factories.Xml;
-
-namespace IBBoard.WarFoundry.GUI.WinForms
-{
-	/// <summary>
-	/// Summary description for Form1.
-	/// </summary>
-	public class FrmMain : System.Windows.Forms.Form
-	{
-		private static readonly string AppTitle = "WarFoundry";
-		internal static readonly string VERSION = "0.1b7pre";
-        const string DefaultDataDir = "data";
-
-		private Preferences preferences;
-		private readonly ILog log = LogManager.GetLogger(typeof(FrmMain));
-
-		private CommandStack commandStack;
-		private ToolStripButton[] categoryButtons;
-
-		public ObjectAddDelegate UnitAddedMethod;
-		public ObjectRemoveDelegate UnitRemovedMethod;
-		public DoubleValChangedDelegate PointsValueChangedMethod;
-		//public FailedUnitRequirementDelegate FailedUnitRequirementMethod;
-
-		private FrmArmyTree armyTree;
-		private string loadedFilePath;
-		private Dictionary<string, FrmUnit> unitWindows;
-
-		private System.ComponentModel.IContainer components;
-		private System.Windows.Forms.ImageList buttonIcons;
-		private System.Windows.Forms.OpenFileDialog openArmyDialog;
-		private System.Windows.Forms.SaveFileDialog saveArmyDialog;
-		private System.Windows.Forms.MainMenu mainMenu;
-		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbMainPanel;
-		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbErrorPanel;
-		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbPointsPanel;
-		private System.Windows.Forms.ContextMenu undoMenu;
-		private System.Windows.Forms.ContextMenu redoMenu;
-		private IBBoard.Windows.Forms.ColorableStatusBar statusBar;
-		private System.Windows.Forms.Timer statusBarTimer;
-		private MenuStrip menuStrip;
-		private ToolStripMenuItem menuFile;
-		private ToolStripMenuItem miNewArmy;
-		private ToolStripMenuItem miOpenArmy;
-		private ToolStripMenuItem miSaveArmy;
-		private ToolStripMenuItem miSaveArmyAs;
-		private ToolStripMenuItem miExportArmyAs;
-		private ToolStripMenuItem miExportArmyAsBasicHTML;
-		private ToolStripMenuItem miCloseArmy;
-		private ToolStripSeparator toolStripSeparator1;
-		private ToolStripMenuItem miReloadFiles;
-		private ToolStripSeparator toolStripSeparator2;
-		private ToolStripMenuItem miExit;
-		private ToolStripMenuItem menuEdit;
-		private ToolStripMenuItem miUndo;
-		private ToolStripMenuItem miRedo;
-		private ToolStripMenuItem menuHelp;
-		private ToolStrip mainToolStrip;
-		private ToolStripButton bttnNewArmy;
-		private ToolStripButton bttnOpenArmy;
-		private ToolStripButton bttnSaveArmy;
-		private ToolStripSeparator toolStripSeparator3;
-		private ToolStripSplitButton bttnUndo;
-		private ToolStripSplitButton bttnRedo;
-		private ToolStrip catToolStrip;
-		private ToolStripPanel toolStripPanel;
-		private ToolStripMenuItem miAbout;
-
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
-		[STAThread]
-		static void Main(string[] args)
-		{
-			try
-			{
-				LogManager.GetLogger(typeof(FrmMain)).Info("Starting WarFoundry WinForms");
-				Application.EnableVisualStyles();
-				Application.Run(new FrmMain(args));
-				LogManager.GetLogger(typeof(FrmMain)).Info("Closing WarFoundry WinForms");
-			}
-			catch (Exception ex)
-			{
-				LogManager.GetLogger(typeof(FrmMain)).Fatal(ex);
-				MessageBox.Show(null, "A major, unexpected and fatal error ocurred while starting the application: \r\n\r\n" + ex.Message + "\r\n\r\n" + ex.StackTrace, "Fatal error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		public FrmMain(string[] args)
-		{
-			this.Closing+=new CancelEventHandler(FrmMain_Closing);
-			CommandStack.CommandStackUpdated += new MethodInvoker(commandStack_CommandStackUpdated);
-
-			InitializeComponent();
-			toolStripPanel.Join(mainToolStrip, 0, 0);
-			toolStripPanel.Join(catToolStrip, 1, 0);
-
-			Preferences = new Preferences("WarFoundry");
-			try
-			{
-				Translation.InitialiseTranslations(Constants.ExecutablePath, Preferences["language"].ToString());
-			}
-			catch (TranslationLoadException ex)
-			{
-				log.Error("Translation loading failed for language " + Preferences["language"].ToString(), ex);
-				MessageBox.Show(this, "Translation loading failed for language " + Preferences["language"].ToString(), "Translation failure", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-
-			ControlTranslator.TranslateControls(Controls);
-			ControlTranslator.TranslateComponents(components.Components);
-			ControlTranslator.TranslateComponent(openArmyDialog);
-			ControlTranslator.TranslateComponent(saveArmyDialog);
-			unitWindows = new Dictionary<string, FrmUnit>();
-
-			WarFoundryCore.GameSystemChanged+= new GameSystemChangedDelegate(FrmMain_GameSystemChanged);
-			WarFoundryCore.ArmyChanged += new ArmyChangedDelegate(FrmMain_ArmyChanged);
-			UnitAddedMethod = new ObjectAddDelegate(FrmMain_UnitAddedMethod);
-			UnitRemovedMethod = new ObjectRemoveDelegate(FrmMain_UnitRemovedMethod);
-			PointsValueChangedMethod = new DoubleValChangedDelegate(FrmMain_PointsValueChangedMethod);
-			//FailedUnitRequirementMethod = new FailedUnitRequirementDelegate(FrmMain_FailedUnitRequirement);
-
-			sbErrorPanel.Color = Color.Red;
-			sbPointsPanel.ToolTipText = Translation.GetTranslation("statusPanelPointsToolTip", "total points value");
-
-			armyTree = new FrmArmyTree(CommandStack);
-			armyTree.MdiParent = this;
-			armyTree.StartPosition = FormStartPosition.Manual;
-			armyTree.Location = new Point(this.DisplayRectangle.Width - armyTree.Width - 10, 10);
-            ControlTranslator.TranslateControl(armyTree);
-
-            // hack to load default files
-            WarFoundryLoader.GetDefault().AddLoadDirectory(new DirectoryInfo(Constants.ExecutablePath + Constants.DirectoryString + DefaultDataDir));
-            WarFoundryLoader.GetDefault().RegisterFactory(WarFoundryXmlFactory.GetFactory());
-			WarFoundryLoader.GetDefault().FileLoadingFinished += FileLoadingFinished;
-			WarFoundrySaver.SetFileSaver(new WarFoundryXmlSaver());
-		}
-
-		public static string DataPath
-		{
-			get { return Constants.ExecutablePath+Constants.DirectoryChar+"data"; }
-		}
-
-		public static String ArmiesPath
-		{
-			get { return Environment.GetFolderPath(Environment.SpecialFolder.Personal); }
-		}
-
-		public Preferences Preferences
-		{
-			get { return preferences; }
-			set { preferences = value; }
-		}
-
-		public CommandStack CommandStack
-		{
-			get 
-			{
-				if (commandStack == null)
-				{					
-					commandStack = new CommandStack();
-				}
-
-				return commandStack; 
-			}
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if (components != null) 
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
+// This file (FrmMain.cs) is a part of the IBBoard.WarFoundry.GUI.WinForms project and is copyright 2007, 2008, 2009 IBBoard.
+//
+// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+using System.IO;
+using System.Threading;
+using log4net;
+using IBBoard;
+using IBBoard.CustomMath;
+using IBBoard.Commands;
+using IBBoard.IO;
+using IBBoard.Lang;
+using IBBoard.Windows.Forms;
+using IBBoard.Windows.Forms.I18N;
+using IBBoard.Xml;
+using IBBoard.WarFoundry.API;
+using IBBoard.WarFoundry.API.Commands;
+using IBBoard.WarFoundry.API.Exporters;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.API.Savers;
+using IBBoard.WarFoundry.API.Factories;
+using IBBoard.WarFoundry.API.Factories.Xml;
+
+namespace IBBoard.WarFoundry.GUI.WinForms
+{
+	/// <summary>
+	/// Summary description for Form1.
+	/// </summary>
+	public class FrmMain : System.Windows.Forms.Form
+	{
+		private static readonly string AppTitle = "WarFoundry";
+		internal static readonly string VERSION = "0.1b7pre";
+        const string DefaultDataDir = "data";
+
+		private Preferences preferences;
+		private readonly ILog log = LogManager.GetLogger(typeof(FrmMain));
+
+		private CommandStack commandStack;
+
+		public ObjectAddDelegate UnitAddedMethod;
+		public ObjectRemoveDelegate UnitRemovedMethod;
+		public DoubleValChangedDelegate PointsValueChangedMethod;
+		//public FailedUnitRequirementDelegate FailedUnitRequirementMethod;
+
+		private FrmArmyTree armyTree;
+		private string loadedFilePath;
+		private Dictionary<string, FrmUnit> unitWindows;
+
+		private System.ComponentModel.IContainer components;
+		private System.Windows.Forms.OpenFileDialog openArmyDialog;
+		private System.Windows.Forms.SaveFileDialog saveArmyDialog;
+		private System.Windows.Forms.MainMenu mainMenu;
+		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbMainPanel;
+		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbErrorPanel;
+		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbPointsPanel;
+		private System.Windows.Forms.ContextMenu undoMenu;
+		private System.Windows.Forms.ContextMenu redoMenu;
+		private IBBoard.Windows.Forms.ColorableStatusBar statusBar;
+		private System.Windows.Forms.Timer statusBarTimer;
+		private MenuStrip menuStrip;
+		private ToolStripMenuItem menuFile;
+		private ToolStripMenuItem miNewArmy;
+		private ToolStripMenuItem miOpenArmy;
+		private ToolStripMenuItem miSaveArmy;
+		private ToolStripMenuItem miSaveArmyAs;
+		private ToolStripMenuItem miExportArmyAs;
+		private ToolStripMenuItem miExportArmyAsBasicHTML;
+		private ToolStripMenuItem miCloseArmy;
+		private ToolStripSeparator toolStripSeparator1;
+		private ToolStripMenuItem miReloadFiles;
+		private ToolStripSeparator toolStripSeparator2;
+		private ToolStripMenuItem miExit;
+		private ToolStripMenuItem menuEdit;
+		private ToolStripMenuItem miUndo;
+		private ToolStripMenuItem miRedo;
+		private ToolStripMenuItem menuHelp;
+		private ToolStrip mainToolStrip;
+		private ToolStripButton bttnNewArmy;
+		private ToolStripButton bttnOpenArmy;
+		private ToolStripButton bttnSaveArmy;
+		private ToolStripSeparator toolStripSeparator3;
+		private ToolStripSplitButton bttnUndo;
+		private ToolStripSplitButton bttnRedo;
+		private ToolStrip catToolStrip;
+		private ToolStripPanel toolStripPanel;
+		private ToolStripMenuItem miAbout;
+
+		/// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static void Main(string[] args)
+		{
+			try
+			{
+				LogManager.GetLogger(typeof(FrmMain)).Info("Starting WarFoundry WinForms");
+				Application.EnableVisualStyles();
+				Application.Run(new FrmMain(args));
+				LogManager.GetLogger(typeof(FrmMain)).Info("Closing WarFoundry WinForms");
+			}
+			catch (Exception ex)
+			{
+				LogManager.GetLogger(typeof(FrmMain)).Fatal(ex);
+				MessageBox.Show(null, "A major, unexpected and fatal error ocurred while starting the application: \r\n\r\n" + ex.Message + "\r\n\r\n" + ex.StackTrace, "Fatal error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+
+		public FrmMain(string[] args)
+		{
+			this.Closing+=new CancelEventHandler(FrmMain_Closing);
+			CommandStack.CommandStackUpdated += new MethodInvoker(commandStack_CommandStackUpdated);
+
+			InitializeComponent();
+			toolStripPanel.Join(mainToolStrip, 0, 0);
+			toolStripPanel.Join(catToolStrip, mainToolStrip.Width+5, 0);
+
+			Preferences = new Preferences("WarFoundry");
+			try
+			{
+				Translation.InitialiseTranslations(Constants.ExecutablePath, Preferences["language"].ToString());
+			}
+			catch (TranslationLoadException ex)
+			{
+				log.Error("Translation loading failed for language " + Preferences["language"].ToString(), ex);
+				MessageBox.Show(this, "Translation loading failed for language " + Preferences["language"].ToString(), "Translation failure", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+
+			ControlTranslator.TranslateControls(Controls);
+			ControlTranslator.TranslateComponents(components.Components);
+			ControlTranslator.TranslateComponent(openArmyDialog);
+			ControlTranslator.TranslateComponent(saveArmyDialog);
+			unitWindows = new Dictionary<string, FrmUnit>();
+
+			WarFoundryCore.GameSystemChanged+= new GameSystemChangedDelegate(FrmMain_GameSystemChanged);
+			WarFoundryCore.ArmyChanged += new ArmyChangedDelegate(FrmMain_ArmyChanged);
+			UnitAddedMethod = new ObjectAddDelegate(FrmMain_UnitAddedMethod);
+			UnitRemovedMethod = new ObjectRemoveDelegate(FrmMain_UnitRemovedMethod);
+			PointsValueChangedMethod = new DoubleValChangedDelegate(FrmMain_PointsValueChangedMethod);
+			//FailedUnitRequirementMethod = new FailedUnitRequirementDelegate(FrmMain_FailedUnitRequirement);
+
+			sbErrorPanel.Color = Color.Red;
+			sbPointsPanel.ToolTipText = Translation.GetTranslation("statusPanelPointsToolTip", "total points value");
+
+			armyTree = new FrmArmyTree(CommandStack);
+			armyTree.MdiParent = this;
+			armyTree.StartPosition = FormStartPosition.Manual;
+			armyTree.Location = new Point(this.DisplayRectangle.Width - armyTree.Width - 10, 10);
+            ControlTranslator.TranslateControl(armyTree);
+
+            // hack to load default files
+            WarFoundryLoader.GetDefault().AddLoadDirectory(new DirectoryInfo(Constants.ExecutablePath + Constants.DirectoryString + DefaultDataDir));
+            WarFoundryLoader.GetDefault().RegisterFactory(WarFoundryXmlFactory.GetFactory());
+			WarFoundryLoader.GetDefault().FileLoadingFinished += FileLoadingFinished;
+			WarFoundrySaver.SetFileSaver(new WarFoundryXmlSaver());
+		}
+
+		public static string DataPath
+		{
+			get { return Constants.ExecutablePath+Constants.DirectoryChar+"data"; }
+		}
+
+		public static String ArmiesPath
+		{
+			get { return Environment.GetFolderPath(Environment.SpecialFolder.Personal); }
+		}
+
+		public Preferences Preferences
+		{
+			get { return preferences; }
+			set { preferences = value; }
+		}
+
+		public CommandStack CommandStack
+		{
+			get 
+			{
+				if (commandStack == null)
+				{					
+					commandStack = new CommandStack();
+				}
+
+				return commandStack; 
+			}
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
+			this.undoMenu = new System.Windows.Forms.ContextMenu();
+			this.redoMenu = new System.Windows.Forms.ContextMenu();
+			this.mainMenu = new System.Windows.Forms.MainMenu(this.components);
+			this.openArmyDialog = new System.Windows.Forms.OpenFileDialog();
+			this.saveArmyDialog = new System.Windows.Forms.SaveFileDialog();
+			this.statusBarTimer = new System.Windows.Forms.Timer(this.components);
+			this.menuStrip = new System.Windows.Forms.MenuStrip();
+			this.menuFile = new System.Windows.Forms.ToolStripMenuItem();
+			this.miNewArmy = new System.Windows.Forms.ToolStripMenuItem();
+			this.miOpenArmy = new System.Windows.Forms.ToolStripMenuItem();
+			this.miSaveArmy = new System.Windows.Forms.ToolStripMenuItem();
+			this.miSaveArmyAs = new System.Windows.Forms.ToolStripMenuItem();
+			this.miExportArmyAs = new System.Windows.Forms.ToolStripMenuItem();
+			this.miExportArmyAsBasicHTML = new System.Windows.Forms.ToolStripMenuItem();
+			this.miCloseArmy = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.miReloadFiles = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.miExit = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuEdit = new System.Windows.Forms.ToolStripMenuItem();
+			this.miUndo = new System.Windows.Forms.ToolStripMenuItem();
+			this.miRedo = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuHelp = new System.Windows.Forms.ToolStripMenuItem();
+			this.miAbout = new System.Windows.Forms.ToolStripMenuItem();
+			this.mainToolStrip = new System.Windows.Forms.ToolStrip();
+			this.bttnNewArmy = new System.Windows.Forms.ToolStripButton();
+			this.bttnOpenArmy = new System.Windows.Forms.ToolStripButton();
+			this.bttnSaveArmy = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.bttnUndo = new System.Windows.Forms.ToolStripSplitButton();
+			this.bttnRedo = new System.Windows.Forms.ToolStripSplitButton();
+			this.catToolStrip = new System.Windows.Forms.ToolStrip();
+			this.statusBar = new IBBoard.Windows.Forms.ColorableStatusBar();
+			this.sbMainPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
+			this.sbErrorPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
+			this.sbPointsPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
+			this.toolStripPanel = new System.Windows.Forms.ToolStripPanel();
+			this.menuStrip.SuspendLayout();
+			this.mainToolStrip.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// saveArmyDialog
+			// 
+			this.saveArmyDialog.Title = "Translatable:saveArmyDialog";
+			// 
+			// statusBarTimer
+			// 
+			this.statusBarTimer.Interval = 5000;
+			this.statusBarTimer.Tick += new System.EventHandler(this.statusBarTimer_Tick);
+			// 
+			// menuStrip
+			// 
+			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.menuFile,
+									this.menuEdit,
+									this.menuHelp});
+			this.menuStrip.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip.Name = "menuStrip";
+			this.menuStrip.Size = new System.Drawing.Size(790, 24);
+			this.menuStrip.TabIndex = 6;
+			this.menuStrip.Text = "menuStrip1";
+			// 
+			// menuFile
+			// 
+			this.menuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.miNewArmy,
+									this.miOpenArmy,
+									this.miSaveArmy,
+									this.miSaveArmyAs,
+									this.miExportArmyAs,
+									this.miCloseArmy,
+									this.toolStripSeparator1,
+									this.miReloadFiles,
+									this.toolStripSeparator2,
+									this.miExit});
+			this.menuFile.Name = "menuFile";
+			this.menuFile.Size = new System.Drawing.Size(33, 20);
+			this.menuFile.Text = "&file";
+			// 
+			// miNewArmy
+			// 
+			this.miNewArmy.Name = "miNewArmy";
+			this.miNewArmy.Size = new System.Drawing.Size(164, 22);
+			this.miNewArmy.Text = "&new army";
+			this.miNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
+			// 
+			// miOpenArmy
+			// 
+			this.miOpenArmy.Name = "miOpenArmy";
+			this.miOpenArmy.Size = new System.Drawing.Size(164, 22);
+			this.miOpenArmy.Text = "&open army";
+			this.miOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
+			// 
+			// miSaveArmy
+			// 
+			this.miSaveArmy.Enabled = false;
+			this.miSaveArmy.Name = "miSaveArmy";
+			this.miSaveArmy.Size = new System.Drawing.Size(164, 22);
+			this.miSaveArmy.Text = "&save army";
+			this.miSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
+			// 
+			// miSaveArmyAs
+			// 
+			this.miSaveArmyAs.Enabled = false;
+			this.miSaveArmyAs.Name = "miSaveArmyAs";
+			this.miSaveArmyAs.Size = new System.Drawing.Size(164, 22);
+			this.miSaveArmyAs.Text = "save army &as...";
+			this.miSaveArmyAs.Click += new System.EventHandler(this.miSaveArmyAs_Click);
+			// 
+			// miExportArmyAs
+			// 
+			this.miExportArmyAs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.miExportArmyAsBasicHTML});
+			this.miExportArmyAs.Enabled = false;
+			this.miExportArmyAs.Name = "miExportArmyAs";
+			this.miExportArmyAs.Size = new System.Drawing.Size(164, 22);
+			this.miExportArmyAs.Text = "export army as...";
+			// 
+			// miExportArmyAsBasicHTML
+			// 
+			this.miExportArmyAsBasicHTML.Name = "miExportArmyAsBasicHTML";
+			this.miExportArmyAsBasicHTML.Size = new System.Drawing.Size(130, 22);
+			this.miExportArmyAsBasicHTML.Text = "&basic html";
+			this.miExportArmyAsBasicHTML.Click += new System.EventHandler(this.miExportArmyAsBasicHTML_Click);
+			// 
+			// miCloseArmy
+			// 
+			this.miCloseArmy.Enabled = false;
+			this.miCloseArmy.Name = "miCloseArmy";
+			this.miCloseArmy.Size = new System.Drawing.Size(164, 22);
+			this.miCloseArmy.Text = "&close army";
+			this.miCloseArmy.Click += new System.EventHandler(this.miCloseArmy_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(161, 6);
+			// 
+			// miReloadFiles
+			// 
+			this.miReloadFiles.Name = "miReloadFiles";
+			this.miReloadFiles.Size = new System.Drawing.Size(164, 22);
+			this.miReloadFiles.Text = "&reload files";
+			this.miReloadFiles.Click += new System.EventHandler(this.miReloadFiles_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6);
+			// 
+			// miExit
+			// 
+			this.miExit.Name = "miExit";
+			this.miExit.Size = new System.Drawing.Size(164, 22);
+			this.miExit.Text = "e&xit";
+			this.miExit.Click += new System.EventHandler(this.miExit_Click);
+			// 
+			// menuEdit
+			// 
+			this.menuEdit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.miUndo,
+									this.miRedo});
+			this.menuEdit.Name = "menuEdit";
+			this.menuEdit.Size = new System.Drawing.Size(36, 20);
+			this.menuEdit.Text = "&edit";
+			// 
+			// miUndo
+			// 
+			this.miUndo.Enabled = false;
+			this.miUndo.Name = "miUndo";
+			this.miUndo.Size = new System.Drawing.Size(106, 22);
+			this.miUndo.Text = "&undo";
+			this.miUndo.Click += new System.EventHandler(this.miUndo_Click);
+			// 
+			// miRedo
+			// 
+			this.miRedo.Enabled = false;
+			this.miRedo.Name = "miRedo";
+			this.miRedo.Size = new System.Drawing.Size(106, 22);
+			this.miRedo.Text = "&redo";
+			this.miRedo.Click += new System.EventHandler(this.miRedo_Click);
+			// 
+			// menuHelp
+			// 
+			this.menuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.miAbout});
+			this.menuHelp.Name = "menuHelp";
+			this.menuHelp.Size = new System.Drawing.Size(39, 20);
+			this.menuHelp.Text = "&help";
+			// 
+			// miAbout
+			// 
+			this.miAbout.Name = "miAbout";
+			this.miAbout.Size = new System.Drawing.Size(109, 22);
+			this.miAbout.Text = "&about";
+			this.miAbout.Click += new System.EventHandler(this.miAbout_Click);
+			// 
+			// mainToolStrip
+			// 
+			this.mainToolStrip.Dock = System.Windows.Forms.DockStyle.None;
+			this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+									this.bttnNewArmy,
+									this.bttnOpenArmy,
+									this.bttnSaveArmy,
+									this.toolStripSeparator3,
+									this.bttnUndo,
+									this.bttnRedo});
+			this.mainToolStrip.Location = new System.Drawing.Point(0, 24);
+			this.mainToolStrip.Name = "mainToolStrip";
+			this.mainToolStrip.Size = new System.Drawing.Size(151, 25);
+			this.mainToolStrip.TabIndex = 8;
+			// 
+			// bttnNewArmy
+			// 
+			this.bttnNewArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.bttnNewArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_new;
+			this.bttnNewArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.bttnNewArmy.Name = "bttnNewArmy";
+			this.bttnNewArmy.Size = new System.Drawing.Size(23, 22);
+			this.bttnNewArmy.Text = "new army";
+			this.bttnNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
+			// 
+			// bttnOpenArmy
+			// 
+			this.bttnOpenArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.bttnOpenArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_open;
+			this.bttnOpenArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.bttnOpenArmy.Name = "bttnOpenArmy";
+			this.bttnOpenArmy.Size = new System.Drawing.Size(23, 22);
+			this.bttnOpenArmy.Text = "open army";
+			this.bttnOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
+			// 
+			// bttnSaveArmy
+			// 
+			this.bttnSaveArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.bttnSaveArmy.Enabled = false;
+			this.bttnSaveArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_save;
+			this.bttnSaveArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.bttnSaveArmy.Name = "bttnSaveArmy";
+			this.bttnSaveArmy.Size = new System.Drawing.Size(23, 22);
+			this.bttnSaveArmy.Text = "save army";
+			this.bttnSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+			// 
+			// bttnUndo
+			// 
+			this.bttnUndo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.bttnUndo.Enabled = false;
+			this.bttnUndo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_undo;
+			this.bttnUndo.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.bttnUndo.Name = "bttnUndo";
+			this.bttnUndo.Size = new System.Drawing.Size(32, 22);
+			this.bttnUndo.Text = "undo";
+			this.bttnUndo.Click += new System.EventHandler(this.miUndo_Click);
+			// 
+			// bttnRedo
+			// 
+			this.bttnRedo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.bttnRedo.Enabled = false;
+			this.bttnRedo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_redo;
+			this.bttnRedo.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.bttnRedo.Name = "bttnRedo";
+			this.bttnRedo.Size = new System.Drawing.Size(32, 22);
+			this.bttnRedo.Text = "redo";
+			this.bttnRedo.Click += new System.EventHandler(this.miRedo_Click);
+			// 
+			// catToolStrip
+			// 
+			this.catToolStrip.Dock = System.Windows.Forms.DockStyle.None;
+			this.catToolStrip.Location = new System.Drawing.Point(161, 24);
+			this.catToolStrip.Name = "catToolStrip";
+			this.catToolStrip.Size = new System.Drawing.Size(111, 25);
+			this.catToolStrip.TabIndex = 9;
+			this.catToolStrip.Visible = false;
+			// 
+			// statusBar
+			// 
+			this.statusBar.Location = new System.Drawing.Point(0, 586);
+			this.statusBar.Name = "statusBar";
+			this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
+									this.sbMainPanel,
+									this.sbErrorPanel,
+									this.sbPointsPanel});
+			this.statusBar.ShowPanels = true;
+			this.statusBar.Size = new System.Drawing.Size(790, 22);
+			this.statusBar.TabIndex = 1;
+			this.statusBar.PanelClick += new System.Windows.Forms.StatusBarPanelClickEventHandler(this.statusBar_PanelClick);
+			this.statusBar.DrawItem += new System.Windows.Forms.StatusBarDrawItemEventHandler(this.statusBar_DrawItem);
+			// 
+			// sbMainPanel
+			// 
+			this.sbMainPanel.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Spring;
+			this.sbMainPanel.Color = System.Drawing.SystemColors.WindowText;
+			this.sbMainPanel.Name = "sbMainPanel";
+			this.sbMainPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
+			this.sbMainPanel.Width = 473;
+			// 
+			// sbErrorPanel
+			// 
+			this.sbErrorPanel.Color = System.Drawing.SystemColors.WindowText;
+			this.sbErrorPanel.Name = "sbErrorPanel";
+			this.sbErrorPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
+			this.sbErrorPanel.Width = 150;
+			// 
+			// sbPointsPanel
+			// 
+			this.sbPointsPanel.Color = System.Drawing.SystemColors.WindowText;
+			this.sbPointsPanel.Name = "sbPointsPanel";
+			this.sbPointsPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
+			this.sbPointsPanel.ToolTipText = "current points total";
+			this.sbPointsPanel.Width = 150;
+			// 
+			// toolStripPanel
+			// 
+			this.toolStripPanel.Dock = System.Windows.Forms.DockStyle.Top;
+			this.toolStripPanel.Location = new System.Drawing.Point(0, 24);
+			this.toolStripPanel.Name = "toolStripPanel";
+			this.toolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			this.toolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+			this.toolStripPanel.Size = new System.Drawing.Size(790, 0);
+			// 
+			// FrmMain
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(790, 608);
+			this.Controls.Add(this.mainToolStrip);
+			this.Controls.Add(this.toolStripPanel);
+			this.Controls.Add(this.statusBar);
+			this.Controls.Add(this.catToolStrip);
+			this.Controls.Add(this.menuStrip);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.IsMdiContainer = true;
+			this.MainMenuStrip = this.menuStrip;
+			this.Menu = this.mainMenu;
+			this.Name = "FrmMain";
+			this.Text = "WarFoundry";
+			this.Load += new System.EventHandler(this.FrmMain_Load);
+			this.menuStrip.ResumeLayout(false);
+			this.menuStrip.PerformLayout();
+			this.mainToolStrip.ResumeLayout(false);
+			this.mainToolStrip.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+		}
+		#endregion
+
+		private void FileLoadingFinished(List<FileLoadFailure> failures)
+		{
+			foreach (FileLoadFailure failure in failures)
+			{
+				log.Warn("Failed to load " + failure.FailedFile.FullName + ": " + failure.Message);
+			}
+		}
+
+		private void miExit_Click(object sender, System.EventArgs e)
+		{
+			Application.Exit();
+		}
+
+		private void miNewArmy_Click(object sender, System.EventArgs e)
+		{
+			CreateNewArmy();
+		}
+
+		private void CreateNewArmy()
+		{
+			if (CloseCurrentArmy())
+			{
+				FrmNewArmy newArmy = new FrmNewArmy(CurrentGameSystem);
+				DialogResult dr = newArmy.ShowDialog();
+
+				if (dr == DialogResult.OK)
+				{
+					try
+					{
+						CurrentArmy = new Army(newArmy.SelectedRace, newArmy.ArmyName, newArmy.ArmySize);
+					}
+					catch (RequiredDataMissingException ex)
+					{
+						log.Error("Required data missing from race file", ex);
+						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidRaceFileBoxTitle", "invalid race file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+					}
+					catch (InvalidFileException ex)
+					{
+						log.Error("Race file was invalid", ex);
+						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidRaceFileBoxTitle", "invalid race file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+					}
+				}
+			}
+		}
+
+		private bool OpenArmy()
+		{
+			if (openArmyDialog.Filter=="")
+			{
+				string savePath = ArmiesPath;
+			
+				if (!Directory.Exists(savePath))
+				{
+					Directory.CreateDirectory(savePath);
+				}
+
+				openArmyDialog.InitialDirectory = savePath;
+				openArmyDialog.Filter = Translation.GetTranslation("armyFileFilter")+"|*.army";
+				openArmyDialog.Title = Translation.GetTranslation("openArmyDialog");
+
+			}
+
+			DialogResult dr = openArmyDialog.ShowDialog(this);
+
+			if (dr == DialogResult.OK)
+			{
+				if (CloseCurrentArmy())
+				{
+					try
+					{
+						string newFilePath = openArmyDialog.FileName;
+						CurrentArmy = WarFoundryLoader.GetDefault().LoadArmy(new FileInfo(newFilePath));
+						loadedFilePath = newFilePath;
+						return true;
+					}
+					catch (RequiredDataMissingException ex)
+					{
+						log.Error(ex);
+						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidArmyFileBoxTitle", "invalid army file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return false;
+					}
+					catch (InvalidFileException ex)
+					{
+						log.Error(ex);
+						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidArmyFileBoxTitle", "invalid army file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		private bool CloseCurrentArmy()
+		{
+			if (CurrentArmy!=null)
+			{
+				bool canClose = false;
+
+				if (CommandStack.IsDirty())
+				{
+					string saveChanges = Translation.GetTranslation("SaveChangesQuestion", "the army \"{0}\" has been modified\r\nsave changes before closing army?", CurrentArmy.Name);
+					string saveChangesTitle = Translation.GetTranslation("SaveChangesTitle", "unsaved changes");
+					DialogResult dr = MessageBox.Show(this, saveChanges, saveChangesTitle, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button3);
+
+					if (dr == DialogResult.Yes)
+					{
+						canClose = SaveCurrentArmy();
+					}
+					else if (dr == DialogResult.No)
+					{
+						canClose = true;
+					}
+					//else they said cancel and we default to "canClose = false" so do nothing
+				}
+				else
+				{
+					canClose = true;
+				}
+
+				if (canClose)
+				{
+					//do close
+					DisableCategoryButtons();
+					CurrentArmy = null;
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+			else
+			{
+				DisableCategoryButtons();
+				//pretend we succeeded
+				return true;
+			}
+		}
+
+		private void UndoLastAction()
+		{
+			if (commandStack.CanUndo())
+			{
+				commandStack.Undo();
+			}
+		}
+
+		private void RedoAction()
+		{
+			if (commandStack.CanRedo())
+			{
+				commandStack.Redo();
+			}
+		}
+
+		private bool SaveCurrentArmy()
+		{
+			bool saved = false;
+
+			string filePath = loadedFilePath;
+
+			if (filePath == null)
+			{
+				filePath = PromptForArmyFilePath();
+			}
+
+			if (filePath != null)
+			{
+				saved = SaveCurrentArmyToFile(filePath);
+			}
+
+			return saved;
+		}
+
+		private bool SaveCurrentArmyAs()
+		{
+			bool saved = false;
+			string filePath = PromptForArmyFilePath();
+
+			if (filePath != null)
+			{
+				saved = SaveCurrentArmyToFile(filePath);
+			}
+			
+			return saved;
+		}
+
+		private bool SaveCurrentArmyToFile(string filePath)
+		{
+			if (WarFoundrySaver.GetSaver().Save(CurrentArmy, filePath))
+			{
+				loadedFilePath = filePath;
+				miSaveArmy.Enabled = false;
+				bttnSaveArmy.Enabled = false;
+				CommandStack.setCleanMark();
+				return true;
+			}
+			else
+			{
+				MessageBox.Show(this, Translation.GetTranslation("SaveFailed", "file save failed - check log for details"), Translation.GetTranslation("SaveFailedTitle", "file save failed"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+		}
+
+		private string PromptForArmyFilePath()
+		{
+			if (saveArmyDialog.Filter == "")
+			{
+				string savePath = ArmiesPath;
+				
+				if (!Directory.Exists(savePath))
+				{
+					Directory.CreateDirectory(savePath);
+				}
+
+				saveArmyDialog.InitialDirectory = savePath;
+				saveArmyDialog.Filter = Translation.GetTranslation("armyFileFilter")+"|*.army";
+				saveArmyDialog.Title = Translation.GetTranslation("saveArmyDialog");
+			}
+
+			DialogResult dr = saveArmyDialog.ShowDialog(this);
+
+			if (dr == DialogResult.OK)
+			{
+				return saveArmyDialog.FileName;
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		public GameSystem CurrentGameSystem
+		{
+			get { return WarFoundryCore.CurrentGameSystem; }
+			set { WarFoundryCore.CurrentGameSystem = value; }
+		}
+
+		public Army CurrentArmy
+		{
+			get { return WarFoundryCore.CurrentArmy; }
+			set { SetArmy(value); }
+		}
+
+		private void FrmMain_GameSystemChanged(GameSystem oldSystem, GameSystem newSystem)
+		{
+			SetAppTitle();
+			RemoveCategoryButtons();
+		}
+
+		private void FrmMain_ArmyChanged(Army oldArmy, Army newArmy)
+		{
+			CommandStack.Reset();
+			loadedFilePath = null;
+			miSaveArmy.Enabled = false;
+			bttnSaveArmy.Enabled = false;
+			SetPointsPanelText();
+			SetAppTitle();
+		}
+
+		private void SetArmy(Army newArmy)
+		{
+			IgnoreArmy(CurrentArmy);
+			CloseAllUnitWindows();
+
+			if (newArmy == null)
+			{
+				SetNullArmyState();
+			}
+			else
+			{
+				WarFoundryCore.CurrentGameSystem = newArmy.GameSystem;
+				ListenToArmy(newArmy);
+				SetNonNullArmyState(newArmy);
+			}
+			
+			WarFoundryCore.CurrentArmy = newArmy;
+		}
+
+		private void IgnoreArmy(Army oldArmy)
+		{
+			if (oldArmy != null)
+			{
+				oldArmy.UnitAdded -= UnitAddedMethod;
+				oldArmy.UnitRemoved -= UnitRemovedMethod;
+				oldArmy.PointsValueChanged -= PointsValueChangedMethod;
+			}
+		}
+
+		private void CloseAllUnitWindows()
+		{
+			FrmUnit[] unitForms = DictionaryUtils.ToArray(unitWindows);
+
+			foreach (FrmUnit window in unitForms)
+			{
+				window.Close();
+			}
+
+			unitWindows.Clear();
+		}
+
+		private void ListenToArmy(Army newArmy)
+		{
+			if (newArmy != null)
+			{
+				newArmy.UnitAdded += UnitAddedMethod;
+				newArmy.UnitRemoved += UnitRemovedMethod;
+				newArmy.PointsValueChanged += PointsValueChangedMethod;
+			}
+		}
+
+		private void SetNullArmyState()
+		{
+			miSaveArmyAs.Enabled = false;
+			miCloseArmy.Enabled = false;
+			miExportArmyAs.Enabled = false;
+			DisableCategoryButtons();
+			armyTree.Hide();
+		}
+
+		private void SetNonNullArmyState(Army newArmy)
+		{
+			SetCategoryButtons(newArmy.Race.Categories);
+			EnableCategoryButtons();
+			miSaveArmyAs.Enabled = true;
+			miCloseArmy.Enabled = true;
+			miExportArmyAs.Enabled = true;
+			armyTree.Show();
+		}
+
+		private void SetCategoryButtons(Category[] cats)
+		{
+			if (CategoryButtonsHaveChanged(cats))
+			{
+				RemoveCategoryButtons();
+				AddCategoryButtons(cats);
+			}
+		}
+
+		private bool CategoryButtonsHaveChanged(Category[] cats)
+		{
+			int catCount = cats.Length;
+			ToolStripItemCollection items = catToolStrip.Items;
+			bool haveChanged = (!catToolStrip.Visible || catCount != items.Count);
+
+			if (!haveChanged)
+			{
+				for (int i = 0; i < catCount; i++)
+				{
+					if (cats[i].Equals(items[i+1].Tag))
+					{
+						haveChanged = true;
+						break;
+					}
+				}
+			}
+
+			return haveChanged;
+		}
+
+		private void RemoveCategoryButtons()
+		{
+			this.Invoke(new MethodInvoker(catToolStrip.Items.Clear));
+		}
+
+		private void AddCategoryButtons(Category[] cats)
+		{
+			int catCount = cats.Length;
+			Category cat;
+			ToolStripButton[] categoryButtons = new ToolStripButton[catCount];
+
+			for (int i = 0; i < catCount; i++)
+			{
+				cat = cats[i];
+				ToolStripButton button = new ToolStripButton();
+				button.Text = cat.Name;
+				button.Tag = cat;
+				button.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.list_add;
+				button.Enabled = false;
+				button.Click += new EventHandler(CreateUnitForCategoryButtonClick);
+				categoryButtons[i] = button;
+			}
+
+			this.Invoke(new ArrayMethodInvoker<ToolStripButton>(catToolStrip.Items.AddRange), new object[]{ categoryButtons });
 		}
 
-		#region Windows Form Designer generated code
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
+		private void CreateUnitForCategoryButtonClick(object sender, EventArgs e)
 		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
-			this.undoMenu = new System.Windows.Forms.ContextMenu();
-			this.redoMenu = new System.Windows.Forms.ContextMenu();
-			this.buttonIcons = new System.Windows.Forms.ImageList(this.components);
-			this.mainMenu = new System.Windows.Forms.MainMenu(this.components);
-			this.openArmyDialog = new System.Windows.Forms.OpenFileDialog();
-			this.saveArmyDialog = new System.Windows.Forms.SaveFileDialog();
-			this.statusBarTimer = new System.Windows.Forms.Timer(this.components);
-			this.menuStrip = new System.Windows.Forms.MenuStrip();
-			this.menuFile = new System.Windows.Forms.ToolStripMenuItem();
-			this.miNewArmy = new System.Windows.Forms.ToolStripMenuItem();
-			this.miOpenArmy = new System.Windows.Forms.ToolStripMenuItem();
-			this.miSaveArmy = new System.Windows.Forms.ToolStripMenuItem();
-			this.miSaveArmyAs = new System.Windows.Forms.ToolStripMenuItem();
-			this.miExportArmyAs = new System.Windows.Forms.ToolStripMenuItem();
-			this.miExportArmyAsBasicHTML = new System.Windows.Forms.ToolStripMenuItem();
-			this.miCloseArmy = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.miReloadFiles = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.miExit = new System.Windows.Forms.ToolStripMenuItem();
-			this.menuEdit = new System.Windows.Forms.ToolStripMenuItem();
-			this.miUndo = new System.Windows.Forms.ToolStripMenuItem();
-			this.miRedo = new System.Windows.Forms.ToolStripMenuItem();
-			this.menuHelp = new System.Windows.Forms.ToolStripMenuItem();
-			this.miAbout = new System.Windows.Forms.ToolStripMenuItem();
-			this.mainToolStrip = new System.Windows.Forms.ToolStrip();
-			this.bttnNewArmy = new System.Windows.Forms.ToolStripButton();
-			this.bttnOpenArmy = new System.Windows.Forms.ToolStripButton();
-			this.bttnSaveArmy = new System.Windows.Forms.ToolStripButton();
-			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-			this.bttnUndo = new System.Windows.Forms.ToolStripSplitButton();
-			this.bttnRedo = new System.Windows.Forms.ToolStripSplitButton();
-			this.catToolStrip = new System.Windows.Forms.ToolStrip();
-			this.statusBar = new IBBoard.Windows.Forms.ColorableStatusBar();
-			this.sbMainPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
-			this.sbErrorPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
-			this.sbPointsPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
-			this.toolStripPanel = new System.Windows.Forms.ToolStripPanel();
-			this.menuStrip.SuspendLayout();
-			this.mainToolStrip.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).BeginInit();
-			((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).BeginInit();
-			((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// buttonIcons
-			// 
-			this.buttonIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer) (resources.GetObject("buttonIcons.ImageStream")));
-			this.buttonIcons.TransparentColor = System.Drawing.Color.Transparent;
-			this.buttonIcons.Images.SetKeyName(0, "");
-			this.buttonIcons.Images.SetKeyName(1, "");
-			this.buttonIcons.Images.SetKeyName(2, "");
-			this.buttonIcons.Images.SetKeyName(3, "");
-			this.buttonIcons.Images.SetKeyName(4, "");
-			this.buttonIcons.Images.SetKeyName(5, "");
-			this.buttonIcons.Images.SetKeyName(6, "");
-			// 
-			// saveArmyDialog
-			// 
-			this.saveArmyDialog.Title = "Translatable:saveArmyDialog";
-			// 
-			// statusBarTimer
-			// 
-			this.statusBarTimer.Interval = 5000;
-			this.statusBarTimer.Tick += new System.EventHandler(this.statusBarTimer_Tick);
-			// 
-			// menuStrip
-			// 
-			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.menuFile,
-            this.menuEdit,
-            this.menuHelp});
-			this.menuStrip.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip.Name = "menuStrip";
-			this.menuStrip.Size = new System.Drawing.Size(790, 24);
-			this.menuStrip.TabIndex = 6;
-			this.menuStrip.Text = "menuStrip1";
-			// 
-			// menuFile
-			// 
-			this.menuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.miNewArmy,
-            this.miOpenArmy,
-            this.miSaveArmy,
-            this.miSaveArmyAs,
-            this.miExportArmyAs,
-            this.miCloseArmy,
-            this.toolStripSeparator1,
-            this.miReloadFiles,
-            this.toolStripSeparator2,
-            this.miExit});
-			this.menuFile.Name = "menuFile";
-			this.menuFile.Size = new System.Drawing.Size(33, 20);
-			this.menuFile.Text = "&file";
-			// 
-			// miNewArmy
-			// 
-			this.miNewArmy.Name = "miNewArmy";
-			this.miNewArmy.Size = new System.Drawing.Size(164, 22);
-			this.miNewArmy.Text = "&new army";
-			this.miNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
-			// 
-			// miOpenArmy
-			// 
-			this.miOpenArmy.Name = "miOpenArmy";
-			this.miOpenArmy.Size = new System.Drawing.Size(164, 22);
-			this.miOpenArmy.Text = "&open army";
-			this.miOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
-			// 
-			// miSaveArmy
-			// 
-			this.miSaveArmy.Enabled = false;
-			this.miSaveArmy.Name = "miSaveArmy";
-			this.miSaveArmy.Size = new System.Drawing.Size(164, 22);
-			this.miSaveArmy.Text = "&save army";
-			this.miSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
-			// 
-			// miSaveArmyAs
-			// 
-			this.miSaveArmyAs.Enabled = false;
-			this.miSaveArmyAs.Name = "miSaveArmyAs";
-			this.miSaveArmyAs.Size = new System.Drawing.Size(164, 22);
-			this.miSaveArmyAs.Text = "save army &as...";
-			this.miSaveArmyAs.Click += new System.EventHandler(this.miSaveArmyAs_Click);
-			// 
-			// miExportArmyAs
-			// 
-			this.miExportArmyAs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.miExportArmyAsBasicHTML});
-			this.miExportArmyAs.Enabled = false;
-			this.miExportArmyAs.Name = "miExportArmyAs";
-			this.miExportArmyAs.Size = new System.Drawing.Size(164, 22);
-			this.miExportArmyAs.Text = "export army as...";
-			// 
-			// miExportArmyAsBasicHTML
-			// 
-			this.miExportArmyAsBasicHTML.Name = "miExportArmyAsBasicHTML";
-			this.miExportArmyAsBasicHTML.Size = new System.Drawing.Size(130, 22);
-			this.miExportArmyAsBasicHTML.Text = "&basic html";
-			this.miExportArmyAsBasicHTML.Click += new System.EventHandler(this.miExportArmyAsBasicHTML_Click);
-			// 
-			// miCloseArmy
-			// 
-			this.miCloseArmy.Enabled = false;
-			this.miCloseArmy.Name = "miCloseArmy";
-			this.miCloseArmy.Size = new System.Drawing.Size(164, 22);
-			this.miCloseArmy.Text = "&close army";
-			this.miCloseArmy.Click += new System.EventHandler(this.miCloseArmy_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(161, 6);
-			// 
-			// miReloadFiles
-			// 
-			this.miReloadFiles.Name = "miReloadFiles";
-			this.miReloadFiles.Size = new System.Drawing.Size(164, 22);
-			this.miReloadFiles.Text = "&reload files";
-			this.miReloadFiles.Click += new System.EventHandler(this.miReloadFiles_Click);
-			// 
-			// toolStripSeparator2
-			// 
-			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6);
-			// 
-			// miExit
-			// 
-			this.miExit.Name = "miExit";
-			this.miExit.Size = new System.Drawing.Size(164, 22);
-			this.miExit.Text = "e&xit";
-			this.miExit.Click += new System.EventHandler(this.miExit_Click);
-			// 
-			// menuEdit
-			// 
-			this.menuEdit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.miUndo,
-            this.miRedo});
-			this.menuEdit.Name = "menuEdit";
-			this.menuEdit.Size = new System.Drawing.Size(36, 20);
-			this.menuEdit.Text = "&edit";
-			// 
-			// miUndo
-			// 
-			this.miUndo.Enabled = false;
-			this.miUndo.Name = "miUndo";
-			this.miUndo.Size = new System.Drawing.Size(106, 22);
-			this.miUndo.Text = "&undo";
-			this.miUndo.Click += new System.EventHandler(this.miUndo_Click);
-			// 
-			// miRedo
-			// 
-			this.miRedo.Enabled = false;
-			this.miRedo.Name = "miRedo";
-			this.miRedo.Size = new System.Drawing.Size(106, 22);
-			this.miRedo.Text = "&redo";
-			this.miRedo.Click += new System.EventHandler(this.miRedo_Click);
-			// 
-			// menuHelp
-			// 
-			this.menuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.miAbout});
-			this.menuHelp.Name = "menuHelp";
-			this.menuHelp.Size = new System.Drawing.Size(39, 20);
-			this.menuHelp.Text = "&help";
-			// 
-			// miAbout
-			// 
-			this.miAbout.Name = "miAbout";
-			this.miAbout.Size = new System.Drawing.Size(109, 22);
-			this.miAbout.Text = "&about";
-			this.miAbout.Click += new System.EventHandler(this.miAbout_Click);
-			// 
-			// mainToolStrip
-			// 
-			this.mainToolStrip.Dock = System.Windows.Forms.DockStyle.None;
-			this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.bttnNewArmy,
-            this.bttnOpenArmy,
-            this.bttnSaveArmy,
-            this.toolStripSeparator3,
-            this.bttnUndo,
-            this.bttnRedo});
-			this.mainToolStrip.Location = new System.Drawing.Point(0, 24);
-			this.mainToolStrip.Name = "mainToolStrip";
-			this.mainToolStrip.Size = new System.Drawing.Size(182, 25);
-			this.mainToolStrip.TabIndex = 8;
-			// 
-			// bttnNewArmy
-			// 
-			this.bttnNewArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.bttnNewArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_new;
-			this.bttnNewArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.bttnNewArmy.Name = "bttnNewArmy";
-			this.bttnNewArmy.Size = new System.Drawing.Size(23, 22);
-			this.bttnNewArmy.Text = "new army";
-			this.bttnNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
-			// 
-			// bttnOpenArmy
-			// 
-			this.bttnOpenArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.bttnOpenArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_open;
-			this.bttnOpenArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.bttnOpenArmy.Name = "bttnOpenArmy";
-			this.bttnOpenArmy.Size = new System.Drawing.Size(23, 22);
-			this.bttnOpenArmy.Text = "open army";
-			this.bttnOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
-			// 
-			// bttnSaveArmy
-			// 
-			this.bttnSaveArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.bttnSaveArmy.Enabled = false;
-			this.bttnSaveArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_save;
-			this.bttnSaveArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.bttnSaveArmy.Name = "bttnSaveArmy";
-			this.bttnSaveArmy.Size = new System.Drawing.Size(23, 22);
-			this.bttnSaveArmy.Text = "save army";
-			this.bttnSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
-			// 
-			// toolStripSeparator3
-			// 
-			this.toolStripSeparator3.Name = "toolStripSeparator3";
-			this.toolStripSeparator3.Size = new System.Drawing.Size(6, 23);
-			// 
-			// bttnUndo
-			// 
-			this.bttnUndo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.bttnUndo.Enabled = false;
-			this.bttnUndo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_undo;
-			this.bttnUndo.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.bttnUndo.Name = "bttnUndo";
-			this.bttnUndo.Size = new System.Drawing.Size(32, 22);
-			this.bttnUndo.Text = "undo";
-			this.bttnUndo.Click += new System.EventHandler(this.miUndo_Click);
-			// 
-			// bttnRedo
-			// 
-			this.bttnRedo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.bttnRedo.Enabled = false;
-			this.bttnRedo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_redo;
-			this.bttnRedo.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.bttnRedo.Name = "bttnRedo";
-			this.bttnRedo.Size = new System.Drawing.Size(32, 22);
-			this.bttnRedo.Text = "redo";
-			this.bttnRedo.Click += new System.EventHandler(this.miRedo_Click);
-			// 
-			// catToolStrip
-			// 
-			this.catToolStrip.Dock = System.Windows.Forms.DockStyle.None;
-			this.catToolStrip.Location = new System.Drawing.Point(161, 24);
-			this.catToolStrip.Name = "catToolStrip";
-			this.catToolStrip.Size = new System.Drawing.Size(111, 25);
-			this.catToolStrip.TabIndex = 9;
-			this.catToolStrip.Visible = false;
-			// 
-			// statusBar
-			// 
-			this.statusBar.Location = new System.Drawing.Point(0, 546);
-			this.statusBar.Name = "statusBar";
-			this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
-            this.sbMainPanel,
-            this.sbErrorPanel,
-            this.sbPointsPanel});
-			this.statusBar.ShowPanels = true;
-			this.statusBar.Size = new System.Drawing.Size(790, 22);
-			this.statusBar.TabIndex = 1;
-			this.statusBar.PanelClick += new System.Windows.Forms.StatusBarPanelClickEventHandler(this.statusBar_PanelClick);
-			this.statusBar.DrawItem += new System.Windows.Forms.StatusBarDrawItemEventHandler(this.statusBar_DrawItem);
-			// 
-			// sbMainPanel
-			// 
-			this.sbMainPanel.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Spring;
-			this.sbMainPanel.Color = System.Drawing.SystemColors.WindowText;
-			this.sbMainPanel.Name = "sbMainPanel";
-			this.sbMainPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
-			this.sbMainPanel.Width = 473;
-			// 
-			// sbErrorPanel
-			// 
-			this.sbErrorPanel.Color = System.Drawing.SystemColors.WindowText;
-			this.sbErrorPanel.Name = "sbErrorPanel";
-			this.sbErrorPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
-			this.sbErrorPanel.Width = 150;
-			// 
-			// sbPointsPanel
-			// 
-			this.sbPointsPanel.Color = System.Drawing.SystemColors.WindowText;
-			this.sbPointsPanel.Name = "sbPointsPanel";
-			this.sbPointsPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
-			this.sbPointsPanel.ToolTipText = "current points total";
-			this.sbPointsPanel.Width = 150;
-			// 
-			// toolStripPanel
-			// 
-			this.toolStripPanel.Dock = System.Windows.Forms.DockStyle.Top;
-			this.toolStripPanel.Location = new System.Drawing.Point(0, 24);
-			this.toolStripPanel.Name = "toolStripPanel";
-			this.toolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			this.toolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-			this.toolStripPanel.Size = new System.Drawing.Size(790, 0);
-			// 
-			// FrmMain
-			// 
-			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-			this.ClientSize = new System.Drawing.Size(790, 568);
-			this.Controls.Add(this.mainToolStrip);
-			this.Controls.Add(this.toolStripPanel);
-			this.Controls.Add(this.catToolStrip);
-			this.Controls.Add(this.statusBar);
-			this.Controls.Add(this.menuStrip);
-			this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon")));
-			this.IsMdiContainer = true;
-			this.MainMenuStrip = this.menuStrip;
-			this.Menu = this.mainMenu;
-			this.Name = "FrmMain";
-			this.Text = "WarFoundry";
-			this.Load += new System.EventHandler(this.FrmMain_Load);
-			this.menuStrip.ResumeLayout(false);
-			this.menuStrip.PerformLayout();
-			this.mainToolStrip.ResumeLayout(false);
-			this.mainToolStrip.PerformLayout();
-			((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).EndInit();
-			((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).EndInit();
-			((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
+			if (sender is ToolStripButton)
+			{
+				ToolStripButton button = (ToolStripButton)sender;
+				object tag = button.Tag;
 
-		}
-		#endregion
+				if (tag is Category)
+				{
+					AddUnitFromCategory((Category)tag);
+				}
+			}
+		}
+
+		private void EnableCategoryButtons()
+		{
+			catToolStrip.Visible = true;
+			SetCategoryButtonState(true);
+		}
+
+		private void DisableCategoryButtons()
+		{
+			catToolStrip.Visible = false;
+			SetCategoryButtonState(false);
+		}
+
+		private void SetCategoryButtonState(bool state)
+		{
+			foreach (ToolStripButton button in catToolStrip.Items)
+			{
+				button.Enabled = state;
+			}
+		}
+
+		private void miSaveArmyAs_Click(object sender, System.EventArgs e)
+		{
+			SaveCurrentArmyAs();
+		}
+
+		private void commandStack_CommandStackUpdated()
+		{
+			bttnUndo.Enabled = commandStack.CanUndo();
+			miUndo.Enabled = bttnUndo.Enabled;
+			bttnRedo.Enabled = commandStack.CanRedo();
+			miRedo.Enabled = bttnRedo.Enabled;
 
-		private void FileLoadingFinished(List<FileLoadFailure> failures)
+			PopulateRedoMenu();
+			PopulateUndoMenu();
+
+			bttnSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null;
+			miSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null;
+		}
+
+		private void PopulateRedoMenu()
 		{
-			foreach (FileLoadFailure failure in failures)
+			int redoLength = commandStack.RedoLength;
+			int maxRedo = Math.Min(10, redoLength);
+			ToolStripItemCollection dropDownItems = bttnRedo.DropDownItems;
+			dropDownItems.Clear();
+
+			for (int i = 1; i <= maxRedo; i++)
 			{
-				log.Warn("Failed to load " + failure.FailedFile.FullName + ": " + failure.Message);
+				Command cmd = commandStack.PeekRedoCommand(i);
+
+				if (cmd == null)
+				{
+					break;
+				}
+
+				dropDownItems.Add(cmd.Description, null, redoMenu_Click);
 			}
 		}
 
-		private void miExit_Click(object sender, System.EventArgs e)
-		{
-			Application.Exit();
-		}
-
-		private void miNewArmy_Click(object sender, System.EventArgs e)
-		{
-			CreateNewArmy();
-		}
-
-		private void CreateNewArmy()
-		{
-			if (CloseCurrentArmy())
-			{
-				FrmNewArmy newArmy = new FrmNewArmy(CurrentGameSystem);
-				DialogResult dr = newArmy.ShowDialog();
-
-				if (dr == DialogResult.OK)
-				{
-					try
-					{
-						CurrentArmy = new Army(newArmy.SelectedRace, newArmy.ArmyName, newArmy.ArmySize);
-					}
-					catch (RequiredDataMissingException ex)
-					{
-						log.Error("Required data missing from race file", ex);
-						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidRaceFileBoxTitle", "invalid race file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
-					}
-					catch (InvalidFileException ex)
-					{
-						log.Error("Race file was invalid", ex);
-						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidRaceFileBoxTitle", "invalid race file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
-					}
-				}
-			}
-		}
-
-		private bool OpenArmy()
+		private void PopulateUndoMenu()
 		{
-			if (openArmyDialog.Filter=="")
-			{
-				string savePath = ArmiesPath;
-			
-				if (!Directory.Exists(savePath))
-				{
-					Directory.CreateDirectory(savePath);
-				}
-
-				openArmyDialog.InitialDirectory = savePath;
-				openArmyDialog.Filter = Translation.GetTranslation("armyFileFilter")+"|*.army";
-				openArmyDialog.Title = Translation.GetTranslation("openArmyDialog");
-
-			}
-
-			DialogResult dr = openArmyDialog.ShowDialog(this);
-
-			if (dr == DialogResult.OK)
-			{
-				if (CloseCurrentArmy())
-				{
-					try
-					{
-						string newFilePath = openArmyDialog.FileName;
-						CurrentArmy = WarFoundryLoader.GetDefault().LoadArmy(new FileInfo(newFilePath));
-						loadedFilePath = newFilePath;
-						return true;
-					}
-					catch (RequiredDataMissingException ex)
-					{
-						log.Error(ex);
-						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidArmyFileBoxTitle", "invalid army file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
-						return false;
-					}
-					catch (InvalidFileException ex)
-					{
-						log.Error(ex);
-						MessageBox.Show(this, ex.Message, Translation.GetTranslation("InvalidArmyFileBoxTitle", "invalid army file"), MessageBoxButtons.OK, MessageBoxIcon.Error);
-						return false;
-					}
-				}
-				else
-				{
-					return false;
-				}
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		private bool CloseCurrentArmy()
-		{
-			if (CurrentArmy!=null)
-			{
-				bool canClose = false;
-
-				if (CommandStack.IsDirty())
-				{
-					string saveChanges = Translation.GetTranslation("SaveChangesQuestion", "the army \"{0}\" has been modified\r\nsave changes before closing army?", CurrentArmy.Name);
-					string saveChangesTitle = Translation.GetTranslation("SaveChangesTitle", "unsaved changes");
-					DialogResult dr = MessageBox.Show(this, saveChanges, saveChangesTitle, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button3);
+			int undoLength = commandStack.UndoLength;
+			int maxUndo = Math.Min(10, undoLength);
+			ToolStripItemCollection dropDownItems = bttnUndo.DropDownItems;
+			dropDownItems.Clear();
 
-					if (dr == DialogResult.Yes)
-					{
-						canClose = SaveCurrentArmy();
-					}
-					else if (dr == DialogResult.No)
-					{
-						canClose = true;
-					}
-					//else they said cancel and we default to "canClose = false" so do nothing
-				}
-				else
-				{
-					canClose = true;
-				}
-
-				if (canClose)
-				{
-					//do close
-					DisableCategoryButtons();
-					CurrentArmy = null;
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-			}
-			else
+			for (int i = 1; i <= maxUndo; i++)
 			{
-				DisableCategoryButtons();
-				//pretend we succeeded
-				return true;
-			}
-		}
-
-		private void UndoLastAction()
-		{
-			if (commandStack.CanUndo())
-			{
-				commandStack.Undo();
-			}
-		}
-
-		private void RedoAction()
-		{
-			if (commandStack.CanRedo())
-			{
-				commandStack.Redo();
-			}
-		}
-
-		private bool SaveCurrentArmy()
-		{
-			bool saved = false;
+				Command cmd = commandStack.PeekUndoCommand(i);
 
-			string filePath = loadedFilePath;
-
-			if (filePath == null)
-			{
-				filePath = PromptForArmyFilePath();
-			}
-
-			if (filePath != null)
-			{
-				saved = SaveCurrentArmyToFile(filePath);
-			}
-
-			return saved;
-		}
-
-		private bool SaveCurrentArmyAs()
-		{
-			bool saved = false;
-			string filePath = PromptForArmyFilePath();
-
-			if (filePath != null)
-			{
-				saved = SaveCurrentArmyToFile(filePath);
-			}
-			
-			return saved;
-		}
-
-		private bool SaveCurrentArmyToFile(string filePath)
-		{
-			if (WarFoundrySaver.GetSaver().Save(CurrentArmy, filePath))
-			{
-				loadedFilePath = filePath;
-				miSaveArmy.Enabled = false;
-				bttnSaveArmy.Enabled = false;
-				CommandStack.setCleanMark();
-				return true;
-			}
-			else
-			{
-				MessageBox.Show(this, Translation.GetTranslation("SaveFailed", "file save failed - check log for details"), Translation.GetTranslation("SaveFailedTitle", "file save failed"), MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return false;
-			}
-		}
-
-		private string PromptForArmyFilePath()
-		{
-			if (saveArmyDialog.Filter == "")
-			{
-				string savePath = ArmiesPath;
-				
-				if (!Directory.Exists(savePath))
+				if (cmd == null)
 				{
-					Directory.CreateDirectory(savePath);
+					break;
 				}
 
-				saveArmyDialog.InitialDirectory = savePath;
-				saveArmyDialog.Filter = Translation.GetTranslation("armyFileFilter")+"|*.army";
-				saveArmyDialog.Title = Translation.GetTranslation("saveArmyDialog");
-			}
-
-			DialogResult dr = saveArmyDialog.ShowDialog(this);
-
-			if (dr == DialogResult.OK)
-			{
-				return saveArmyDialog.FileName;
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		public GameSystem CurrentGameSystem
-		{
-			get { return WarFoundryCore.CurrentGameSystem; }
-			set { WarFoundryCore.CurrentGameSystem = value; }
-		}
-
-		public Army CurrentArmy
-		{
-			get { return WarFoundryCore.CurrentArmy; }
-			set { SetArmy(value); }
-		}
-
-		private void FrmMain_GameSystemChanged(GameSystem oldSystem, GameSystem newSystem)
-		{
-			SetAppTitle();
-			RemoveCategoryButtons();
-		}
-
-		private void FrmMain_ArmyChanged(Army oldArmy, Army newArmy)
-		{
-			CommandStack.Reset();
-			loadedFilePath = null;
-			miSaveArmy.Enabled = false;
-			bttnSaveArmy.Enabled = false;
-			SetPointsPanelText();
-			SetAppTitle();
-		}
-
-		private void SetArmy(Army newArmy)
-		{
-			IgnoreArmy(CurrentArmy);
-			CloseAllUnitWindows();
-
-			if (newArmy == null)
-			{
-				SetNullArmyState();
-			}
-			else
-			{
-				WarFoundryCore.CurrentGameSystem = newArmy.GameSystem;
-				ListenToArmy(newArmy);
-				SetNonNullArmyState(newArmy);
-			}
-			
-			WarFoundryCore.CurrentArmy = newArmy;
-		}
-
-		private void IgnoreArmy(Army oldArmy)
-		{
-			if (oldArmy != null)
-			{
-				oldArmy.UnitAdded -= UnitAddedMethod;
-				oldArmy.UnitRemoved -= UnitRemovedMethod;
-				oldArmy.PointsValueChanged -= PointsValueChangedMethod;
-			}
-		}
-
-		private void CloseAllUnitWindows()
-		{
-			FrmUnit[] unitForms = DictionaryUtils.ToArray(unitWindows);
-
-			foreach (FrmUnit window in unitForms)
-			{
-				window.Close();
-			}
-
-			unitWindows.Clear();
-		}
-
-		private void ListenToArmy(Army newArmy)
-		{
-			if (newArmy != null)
-			{
-				newArmy.UnitAdded += UnitAddedMethod;
-				newArmy.UnitRemoved += UnitRemovedMethod;
-				newArmy.PointsValueChanged += PointsValueChangedMethod;
+				dropDownItems.Add(cmd.UndoDescription, null, undoMenu_Click);
 			}
-		}
-
-		private void SetNullArmyState()
-		{
-			miSaveArmyAs.Enabled = false;
-			miCloseArmy.Enabled = false;
-			miExportArmyAs.Enabled = false;
-			DisableCategoryButtons();
-			armyTree.Hide();
-		}
-
-		private void SetNonNullArmyState(Army newArmy)
-		{
-			SetCategoryButtons(newArmy.Race.Categories);
-			EnableCategoryButtons();
-			miSaveArmyAs.Enabled = true;
-			miCloseArmy.Enabled = true;
-			miExportArmyAs.Enabled = true;
-			armyTree.Show();
-		}
-
-		private void SetCategoryButtons(Category[] cats)
-		{
-			if (CategoryButtonsHaveChanged(cats))
-			{
-				RemoveCategoryButtons();
-				AddCategoryButtons(cats);
-			}
-		}
-
-		private bool CategoryButtonsHaveChanged(Category[] cats)
-		{
-			int catCount = cats.Length;
-			bool haveChanged = (categoryButtons == null || catCount != (categoryButtons.Length - 1));
-
-			if (!haveChanged)
-			{
-				for (int i = 0; i < catCount; i++)
-				{
-					if (cats[i].Equals(categoryButtons[i+1].Tag))
-					{
-						haveChanged = true;
-						break;
-					}
-				}
-			}
-
-			return haveChanged;
-		}
-
-		private void RemoveCategoryButtons()
-		{
-			if (categoryButtons!=null)
+		}
+
+		private void miSaveArmy_Click(object sender, System.EventArgs e)
+		{
+			SaveCurrentArmy();
+		}
+
+		private void SetAppTitle()
+		{
+			string str = AppTitle;
+
+			if (CurrentGameSystem!=null)
+			{
+				str+= " - "+CurrentGameSystem.Name;
+			}
+
+			if (CurrentArmy!=null)
+			{
+				str+= " - "+CurrentArmy.Name;
+			}
+
+			this.Text = str;
+		}
+
+		private void AddUnitFromCategory(Category cat)
+		{
+			FrmNewUnit newUnit = new FrmNewUnit(CurrentArmy.Race, cat, CurrentArmy);
+			DialogResult dr = newUnit.ShowDialog(this);
+
+			if (dr == DialogResult.OK)
+			{
+				CreateAndAddUnitCommand cmd = new CreateAndAddUnitCommand(newUnit.SelectedUnit, CurrentArmy.GetCategory(cat));
+				commandStack.Execute(cmd);
+				OpenUnitDialog(cmd.Unit);
+			}
+		}
+
+		internal void OpenUnitDialog(Unit unit)
+		{
+			string unitID = unit.ID;
+
+			if (unitWindows.ContainsKey(unitID))
+			{
+				unitWindows[unitID].Focus();
+			}
+			else
+			{
+				FrmUnit unitForm = new FrmUnit(unit, commandStack);
+				unitWindows.Add(unitID, unitForm);
+				unitForm.MdiParent = this;
+				unitForm.Closing += new CancelEventHandler(unitForm_Closing);
+				unitForm.Show();
+			}
+		}
+
+		private void unitForm_Closing(object sender, CancelEventArgs e)
+		{
+			if (sender is FrmUnit)
+			{
+				FrmUnit unitForm = (FrmUnit) sender;
+				unitWindows.Remove(unitForm.Unit.ID);
+			}
+		}
+
+		private void FrmMain_UnitAddedMethod(object unitObj)
+		{
+			if (unitObj is Unit)
+			{
+				Unit unit = (Unit)unitObj;
+				sbErrorPanel.Text = "";
+			}
+		}
+
+		private void FrmMain_UnitRemovedMethod(object unitObj)
+		{
+			if (unitObj is Unit)
+			{
+				Unit unit = (Unit)unitObj;
+				sbErrorPanel.Text = "";
+
+				//check if window is open, and close it if it is
+				foreach (Form frm in this.MdiChildren)
+				{
+					if (frm is FrmUnit)
+					{
+						if (((FrmUnit)frm).Unit == unit)
+						{
+							frm.Close();
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		/*private void FrmMain_FailedUnitRequirement(FailedUnitRequirement failedRequirement)
+		{
+			sbErrorPanel.Text = Translation.GetTranslation("UnitRequirementFailed", "Unit Requirement Failed");
+			sbErrorPanel.Tag = failedRequirement.Description;
+		}*/
+
+		/*public void MdiChildMoved()
+		{
+			Point mouseAt = PointToClient(ActiveMdiChild.Location);
+
+			if (Comparisons.ValueWithinAmount(pnlRight.Right, ActiveMdiChild.Right, 10))
+			{
+				pnlRight.Visible = true;
+				//pnlRight.Container.Add(ActiveMdiChild);
+			}
+			else
+			{
+				pnlRight.Visible = false;
+			}
+		}*/
+
+		private void miUndo_Click(object sender, System.EventArgs e)
+		{
+			UndoLastAction();
+		}
+
+		private void miRedo_Click(object sender, System.EventArgs e)
+		{
+			RedoAction();
+		}
+
+		private void miCloseArmy_Click(object sender, EventArgs e)
+		{
+			CloseCurrentArmy();
+		}
+
+		private void miOpenArmy_Click(object sender, EventArgs e)
+		{
+			OpenArmy();
+		}
+
+		private void FrmMain_PointsValueChangedMethod(WarFoundryObject obj, double oldVal, double newVal)
+		{
+			if (obj is Army)
+			{
+				SetPointsPanelText();
+			}
+		}
+
+		private void SetPointsPanelText()
+		{	
+			if (CurrentArmy==null)
+			{
+				sbPointsPanel.Text = "";
+				sbPointsPanel.ResetColor();
+			}
+			else 
+			{
+				sbPointsPanel.Text = String.Format(Translation.GetTranslation("statusPanelPoints"), CurrentArmy.Points, CurrentArmy.MaxPoints);
+
+				if (CurrentArmy.Points>CurrentArmy.MaxPoints)
+				{
+					sbPointsPanel.Color = Color.Red;
+				}
+				else
+				{
+					sbPointsPanel.ResetColor();
+				}
+			}
+		}
+
+		private void redoMenu_Click(object sender, EventArgs e)
+		{
+			if (sender is ToolStripDropDownItem)
 			{
-				this.Invoke(new MethodInvoker(catToolStrip.Items.Clear));
-			}
-		}
-
-		private void AddCategoryButtons(Category[] cats)
-		{
-			int catCount = cats.Length;
-			Category cat;
-			categoryButtons = new ToolStripButton[catCount];
-
-			ToolStripButton button;
-
-			for (int i = 0; i < catCount; i++)
-			{
-				cat = cats[i];
-				button = new ToolStripButton();
-				button.Text = cat.Name;
-				button.Tag = cat;
-				button.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.list_add;
-				button.Enabled = false;
-				categoryButtons[i] = button;
-			}
-
-			this.Invoke(new ArrayMethodInvoker<ToolStripButton>(catToolStrip.Items.AddRange), new object[]{ categoryButtons });
-		}
-
-		private void EnableCategoryButtons()
-		{
-			catToolStrip.Visible = true;
-			SetCategoryButtonState(true);
-		}
-
-		private void DisableCategoryButtons()
-		{
-			catToolStrip.Visible = false;
-			SetCategoryButtonState(false);
-		}
-
-		private void SetCategoryButtonState(bool state)
-		{
-			if (categoryButtons!=null)
-			{
-				for (int i = 0; i<categoryButtons.Length; i++)
-				{
-					categoryButtons[i].Enabled = state;
-				}
-			}
-		}
-
-		private void miSaveArmyAs_Click(object sender, System.EventArgs e)
-		{
-			SaveCurrentArmyAs();
-		}
-
-		private void commandStack_CommandStackUpdated()
-		{
-			bttnUndo.Enabled = commandStack.CanUndo();
-			miUndo.Enabled = bttnUndo.Enabled;
-			bttnRedo.Enabled = commandStack.CanRedo();
-			miRedo.Enabled = bttnRedo.Enabled;
-			MenuItem[] menuItems = null;
-			int redoLength = commandStack.RedoLength;
-			int maxRedo = Math.Min(10, redoLength);
-			
-			if (redoLength > 0)
-			{
-				menuItems = new MenuItem[maxRedo];
-				Command com;
-				MenuItem mi;
-
-				for (int i = 0; i < maxRedo; i++)
-				{
-					com = commandStack.PeekRedoCommand(i+1);
-
-					if (com == null)
-					{
-						break; 
-					}
+				ToolStripDropDownItem item = (ToolStripDropDownItem)sender;
+					//we know it's an redo menu item so find it's index and redo everything					
+				int max = bttnRedo.DropDownItems.IndexOf(item);
 
-					mi = new MenuItem(com.Description);
-					mi.Click+=new EventHandler(redoMenu_Click);
-					menuItems[i] = mi;
-				}
-			}
-
-			redoMenu.MenuItems.Clear();
-
-			if (menuItems!=null && menuItems[0]!=null)
-			{
-				bttnRedo.ToolTipText = menuItems[0].Text;
-				redoMenu.MenuItems.AddRange(menuItems);
-			}
-
-			int undoLength = commandStack.UndoLength;
-			int maxUndo = Math.Min(10, undoLength);
-			MenuItem[] menuItemsUndo = null;
-			
-			if (undoLength > 0)
-			{
-				menuItemsUndo = new MenuItem[maxUndo];
-				Command com;
-				MenuItem mi;
-
-				for (int i = 0; i < maxUndo; i++)
+				if (max >= 0)
 				{
-					com = commandStack.PeekUndoCommand(i+1);
-
-					if (com == null)
-					{
-						break; 
-					}
-
-					mi = new MenuItem(com.UndoDescription);
-					mi.Click+=new EventHandler(undoMenu_Click);
-					menuItemsUndo[i] = mi;
-				}
-			}
-
-			undoMenu.MenuItems.Clear();
-
-			if (menuItemsUndo!=null && menuItemsUndo[0]!=null)
-			{
-				bttnUndo.ToolTipText = menuItemsUndo[0].Text;
-				undoMenu.MenuItems.AddRange(menuItemsUndo);
-			}
-
-			bttnSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null;
-			miSaveArmy.Enabled = commandStack.IsDirty() && CurrentArmy!=null;
-		}
-
-		private void miSaveArmy_Click(object sender, System.EventArgs e)
-		{
-			SaveCurrentArmy();
-		}
-
-		private void SetAppTitle()
-		{
-			string str = AppTitle;
-
-			if (CurrentGameSystem!=null)
-			{
-				str+= " - "+CurrentGameSystem.Name;
-			}
-
-			if (CurrentArmy!=null)
-			{
-				str+= " - "+CurrentArmy.Name;
-			}
-
-			this.Text = str;
-		}
-
-		private void AddUnitFromCategory(Category cat)
-		{
-			FrmNewUnit newUnit = new FrmNewUnit(CurrentArmy.Race, cat, CurrentArmy);
-			DialogResult dr = newUnit.ShowDialog(this);
-
-			if (dr == DialogResult.OK)
-			{
-				CreateAndAddUnitCommand cmd = new CreateAndAddUnitCommand(newUnit.SelectedUnit, CurrentArmy.GetCategory(cat));
-				commandStack.Execute(cmd);
-				OpenUnitDialog(cmd.Unit);
-			}
-		}
-
-		internal void OpenUnitDialog(Unit unit)
-		{
-			string unitID = unit.ID;
-
-			if (unitWindows.ContainsKey(unitID))
-			{
-				unitWindows[unitID].Focus();
-			}
-			else
-			{
-				FrmUnit unitForm = new FrmUnit(unit, commandStack);
-				unitWindows.Add(unitID, unitForm);
-				unitForm.MdiParent = this;
-				unitForm.Closing += new CancelEventHandler(unitForm_Closing);
-				unitForm.Show();
-			}
-		}
-
-		private void unitForm_Closing(object sender, CancelEventArgs e)
-		{
-			if (sender is FrmUnit)
-			{
-				FrmUnit unitForm = (FrmUnit) sender;
-				unitWindows.Remove(unitForm.Unit.ID);
-			}
-		}
-
-		private void FrmMain_UnitAddedMethod(object unitObj)
-		{
-			if (unitObj is Unit)
-			{
-				Unit unit = (Unit)unitObj;
-				sbErrorPanel.Text = "";
-			}
-		}
-
-		private void FrmMain_UnitRemovedMethod(object unitObj)
-		{
-			if (unitObj is Unit)
-			{
-				Unit unit = (Unit)unitObj;
-				sbErrorPanel.Text = "";
-
-				//check if window is open, and close it if it is
-				foreach (Form frm in this.MdiChildren)
-				{
-					if (frm is FrmUnit)
-					{
-						if (((FrmUnit)frm).Unit == unit)
-						{
-							frm.Close();
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		/*private void FrmMain_FailedUnitRequirement(FailedUnitRequirement failedRequirement)
-		{
-			sbErrorPanel.Text = Translation.GetTranslation("UnitRequirementFailed", "Unit Requirement Failed");
-			sbErrorPanel.Tag = failedRequirement.Description;
-		}*/
-
-		/*public void MdiChildMoved()
-		{
-			Point mouseAt = PointToClient(ActiveMdiChild.Location);
-
-			if (Comparisons.ValueWithinAmount(pnlRight.Right, ActiveMdiChild.Right, 10))
-			{
-				pnlRight.Visible = true;
-				//pnlRight.Container.Add(ActiveMdiChild);
-			}
-			else
-			{
-				pnlRight.Visible = false;
-			}
-		}*/
-
-		private void miUndo_Click(object sender, System.EventArgs e)
-		{
-			UndoLastAction();
-		}
-
-		private void miRedo_Click(object sender, System.EventArgs e)
-		{
-			RedoAction();
-		}
-
-		private void miCloseArmy_Click(object sender, EventArgs e)
-		{
-			CloseCurrentArmy();
-		}
-
-		private void miOpenArmy_Click(object sender, EventArgs e)
-		{
-			OpenArmy();
-		}
-
-		private void FrmMain_PointsValueChangedMethod(WarFoundryObject obj, double oldVal, double newVal)
-		{
-			if (obj is Army)
-			{
-				SetPointsPanelText();
-			}
-		}
-
-		private void SetPointsPanelText()
-		{	
-			if (CurrentArmy==null)
-			{
-				sbPointsPanel.Text = "";
-				sbPointsPanel.ResetColor();
-			}
-			else 
-			{
-				sbPointsPanel.Text = String.Format(Translation.GetTranslation("statusPanelPoints"), CurrentArmy.Points, CurrentArmy.MaxPoints);
-
-				if (CurrentArmy.Points>CurrentArmy.MaxPoints)
-				{
-					sbPointsPanel.Color = Color.Red;
-				}
-				else
-				{
-					sbPointsPanel.ResetColor();
-				}
-			}
-		}
-
-		private void redoMenu_Click(object sender, EventArgs e)
-		{
-			if (sender is MenuItem)
-			{
-				MenuItem mi = (MenuItem)sender;
-
-				if (mi.Parent == redoMenu)
-				{
-					//we know it's an redo menu item so find it's index and redo everything					
-					int max = mi.Index;
-
 					for (int i = 0; i <= max; i++)
 					{
 						commandStack.Redo();
 					}
-				}
-			}
-		}
-
+				}
+			}
+		}
+
 		private void undoMenu_Click(object sender, EventArgs e)
 		{
-			if (sender is MenuItem)
+			if (sender is ToolStripDropDownItem)
 			{
-				MenuItem mi = (MenuItem)sender;
+				ToolStripDropDownItem item = (ToolStripDropDownItem)sender;
+				//we know it's an redo menu item so find it's index and redo everything					
+				int max = bttnUndo.DropDownItems.IndexOf(item);
 
-				if (mi.Parent == undoMenu)
+				if (max >= 0)
 				{
-					//we know it's an undo menu item so find it's index and undo everything
-					int max = mi.Index;
 					for (int i = 0; i <= max; i++)
 					{
 						commandStack.Undo();
 					}
 				}
-			}
-		}
-
-		private void statusBar_DrawItem(object sender, System.Windows.Forms.StatusBarDrawItemEventArgs sbdevent)
-		{
-			statusBar.ColorableStatusBarDrawItem(sender, sbdevent);
-		}
-
-		private void FrmMain_Closing(object sender, CancelEventArgs e)
-		{
-			if (!CloseCurrentArmy())
-			{
-				e.Cancel = true;
-			}
-		}
-
-		private void miReloadFiles_Click(object sender, System.EventArgs e)
-		{
-			WarFoundryLoader.GetDefault().LoadFiles();
-			sbMainPanel.Text = Translation.GetTranslation("GameSystemFilesReloaded", "Game system and race files reloaded");
-			statusBarTimer.Enabled = true;
-		}
-
-		private void statusBarTimer_Tick(object sender, System.EventArgs e)
-		{
-			sbMainPanel.Text = "";
-			statusBarTimer.Enabled = false;
-		}
-
-		private void statusBar_PanelClick(object sender, StatusBarPanelClickEventArgs e)
-		{
-			if (e.StatusBarPanel == sbErrorPanel && sbErrorPanel.Text!="")
-			{
-				MessageBox.Show(this, sbErrorPanel.TagString, Translation.GetTranslation("FailedRequirementMessage"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
-			}
-		}
-
-		private void miExportArmyAsBasicHTML_Click(object sender, EventArgs e)
-		{
-			SaveFileDialog dialog = new SaveFileDialog();
-			dialog.Filter = Translation.GetTranslation("armyExportBasicHtmlFilter", "HTML pages") + "|*.html";
-			dialog.Title = Translation.GetTranslation("exportArmyDialog", "Export army");
-
-			DialogResult dr = dialog.ShowDialog(this);
-
-			if (dr == DialogResult.OK)
-			{
-				Army army = CurrentArmy;
-				string filePath = dialog.FileName;
-				log.DebugFormat("Exporting {0} to {1} as basic HTML", army.Name, filePath);
-				WarFoundryHtmlExporter.GetDefault().ExportArmy(army, filePath);
-			}
-		}
-
-		private void FrmMain_Load(object sender, EventArgs e)
-		{
-			string gameSystemID = Preferences.GetStringProperty("currSystem");
-
-			if (gameSystemID != null && !"".Equals(gameSystemID))
-			{
-				log.Debug("Attempting to load current game system from properties");
-				GameSystem sys = WarFoundryLoader.GetDefault().GetGameSystem(gameSystemID);
-
-				if (sys != null)
-				{
-					WarFoundryCore.CurrentGameSystem = sys;
-					log.InfoFormat("Loaded game system {0} from properties", gameSystemID);
-				}
-			}
-		}
-
-		private void miAbout_Click(object sender, EventArgs e)
-		{
-			FrmAbout about = new FrmAbout();
-			about.ShowDialog(this);
-		}
-	}
-}
+			}
+		}
+
+		private void statusBar_DrawItem(object sender, System.Windows.Forms.StatusBarDrawItemEventArgs sbdevent)
+		{
+			statusBar.ColorableStatusBarDrawItem(sender, sbdevent);
+		}
+
+		private void FrmMain_Closing(object sender, CancelEventArgs e)
+		{
+			if (!CloseCurrentArmy())
+			{
+				e.Cancel = true;
+			}
+		}
+
+		private void miReloadFiles_Click(object sender, System.EventArgs e)
+		{
+			WarFoundryLoader.GetDefault().LoadFiles();
+			sbMainPanel.Text = Translation.GetTranslation("GameSystemFilesReloaded", "Game system and race files reloaded");
+			statusBarTimer.Enabled = true;
+		}
+
+		private void statusBarTimer_Tick(object sender, System.EventArgs e)
+		{
+			sbMainPanel.Text = "";
+			statusBarTimer.Enabled = false;
+		}
+
+		private void statusBar_PanelClick(object sender, StatusBarPanelClickEventArgs e)
+		{
+			if (e.StatusBarPanel == sbErrorPanel && sbErrorPanel.Text!="")
+			{
+				MessageBox.Show(this, sbErrorPanel.TagString, Translation.GetTranslation("FailedRequirementMessage"), MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			}
+		}
+
+		private void miExportArmyAsBasicHTML_Click(object sender, EventArgs e)
+		{
+			SaveFileDialog dialog = new SaveFileDialog();
+			dialog.Filter = Translation.GetTranslation("armyExportBasicHtmlFilter", "HTML pages") + "|*.html";
+			dialog.Title = Translation.GetTranslation("exportArmyDialog", "Export army");
+
+			DialogResult dr = dialog.ShowDialog(this);
+
+			if (dr == DialogResult.OK)
+			{
+				Army army = CurrentArmy;
+				string filePath = dialog.FileName;
+				log.DebugFormat("Exporting {0} to {1} as basic HTML", army.Name, filePath);
+				WarFoundryHtmlExporter.GetDefault().ExportArmy(army, filePath);
+			}
+		}
+
+		private void FrmMain_Load(object sender, EventArgs e)
+		{
+			string gameSystemID = Preferences.GetStringProperty("currSystem");
+
+			if (gameSystemID != null && !"".Equals(gameSystemID))
+			{
+				log.Debug("Attempting to load current game system from properties");
+				GameSystem sys = WarFoundryLoader.GetDefault().GetGameSystem(gameSystemID);
+
+				if (sys != null)
+				{
+					WarFoundryCore.CurrentGameSystem = sys;
+					log.InfoFormat("Loaded game system {0} from properties", gameSystemID);
+				}
+			}
+		}
+
+		private void miAbout_Click(object sender, EventArgs e)
+		{
+			FrmAbout about = new FrmAbout();
+			about.ShowDialog(this);
+		}
+	}
+}

Binary file FrmMain.resources has changed

--- a/FrmMain.resx	Sat Mar 06 16:33:28 2010 +0000
+++ b/FrmMain.resx	Sat Mar 06 21:09:02 2010 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -123,123 +123,6 @@
   <metadata name="redoMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>122, 17</value>
   </metadata>
-  <metadata name="buttonIcons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>224, 17</value>
-  </metadata>
-  <data name="buttonIcons.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAM
-        GQAAAk1TRnQBSQFMAgEBBwEAAQkBAAEEAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABIAMAAQEBAAEYBgABGBgAAQYBmgFOAQYBmgFOAQYBmgFOAQYBmgFOHgABawFwAW4BawFwAW4BawFw
-        AW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BawFw
-        AW4BawFwAW4BawFwAW4BawFwAW5jAAEGAZoBTgEPAagBWgEsAdYBwAECAZkBmgEGAZoBTh4AAWsBcAFu
-        Hv8DAAn/AWsBcAFuYwABBgGaAU4BIwHHAa8BBQGdAZEBBgGaAU4hAAFrAXABbgP/AbYBuAG3AbYBuAG3
-        AbYBuAG3AbYBuAG3AbYBuAG3AbYBuAG3AbYBuAG3AbYBuAG3A/8DAAn/AWsBcAFuEgABpAFlATQBpAFl
-        ATQBpAFlATQBpAFlATRFAAEGAZoBTgE6Ad0BuAEGAZoBTg8AAQYBmgFOAQYBmgFODwABawFwAW4D7wGt
-        AbABrwGuAbACrgGwAa8BrQGwAa4BrQGwAa8BrQGwAa8BrQGwAa8BrQGwAa8B7wHuAe8DAAHuAe8B7gHv
-        Au4B7wHuAe8BawFwAW4SAAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNEUAAQYBmgFOATcB2QGzAQYBmgFO
-        AQYBmgFODAABBgGaAU4BBgGaAU4BBgGaAU4MAAFrAXABbgPcAtsB3AHbBtwB2wHcAdsD3AHbBNwB2wHc
-        AdsC3AHbAwAB2wTcAdsD3AFrAXABbhIAAaQBZQE0AeYBzgG3AdkBrQGGAaQBZQE0RQABBgGaAU4BRgHi
-        Ab4BBQGmAZkBBgGaAU4BBgGaAU4BBgGaAU4GAAEGAZoBTgE0AeIBigEGAZoBTgEGAZoBTgkAAWsBcAFu
-        AaEBpAGjAaEBpAGiAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGj
-        AaEBpAGjAaEBpAGjAaEBpAGjAaEBpAGjAWsBcAFuEgABpAFlATQB5gHOAbcB2QGtAYYBpAFlATRFAAEK
-        AZ0BUgFkAewBsgEkAdYBzQELAaEBkwEGAZoBTgEGAZoBTgEGAZoBTgEGAZoBTgEGAZoBTgEeAdQBzAE0
-        AeIBigEGAZoBTgEGAZoBTgYAAWsBcAFuA/cD4wPuBvoByAHUAc4BjgFsAT8BiwFnATgBtAGuAZoD+gP8
-        A+4D4wPwAWsBcAFuBgABpAFlATQBpAFlATQBpAFlATQBpAFlATQBpAFlATQB2QGtAYYB2QGtAYYBpAFl
-        ATQBpAFlATQBpAFlATQBpAFlATQBpAFlATQ5AAEMAZ8BVQFjAekBsQExAeABugEXAdQBywEiAdYBmwEj
-        AdoBoQEjAdoBoQEjAdoBoQEjAdoBoQEjAd4B2QEWAdIBcwE0AeIBigEGAZoBTgEGAZoBTgMAAWsBcAFu
-        A/kD7gP6A+QBvwHLAcUBiwFnATgB4wHLAawB3AG/AZgBjwFrATsBrAGmAZID5AP6A+4D8QFrAXABbgYA
-        AaQBZQE0AeUBzAG0AdsBtwGVAdsBtgGUAdoBtAGSAdoBswGQAdkBrQGGAdgBqgGDAdcBqAF/AdcBpgF9
-        AeABvgGfAaQBZQE0OQABBgGaAU4BMAHCAZ0BYAHtAbEBJgHfAaUBGgHXAa8BGgHXAa8BCQHQAcgBFAHQ
-        AXcBFgHSAXMBFgHSAXMBFgHSAXMBFgHSAXMBNAHiAYoBBgGaAU4BBgGaAU4BawFwAW4D+QP6A+QBvwHL
-        AcUBiwFnATgB3AG/AZgBwAGfAXMBwAGfAXMB3wHIAasBiwFnATgBrAGmAZID5AP0A/EBawFwAW4GAAGk
-        AWUBNAHoAdMBwAHnAdEBuwHnAdEBvAHmAc4BtwHmAc4BtwHmAc4BtwHmAc4BtwHmAc0BtgHmAcwBtQHm
-        AcwBtgGkAWUBNDkAAQYBmgFOAQYBmgFOAUYB2AGpAWUB7wGxASQB3gGkASoB3QGXASQB2wGgASQB2wGg
-        ARoB1wGvARYB0gFzARYB0gFzARYB0gFzARgB0wF1AWwB8wGuAQYBmgFOAWsBcAFuA/oB6gLpAcQBzwHK
-        AYsBZwE4AdwBvwGYAb8BnwFxAb8BnwFxAb8BnwFxAcABnwFzAdgBuwGWAYsBZwE4Aa8BqQGVAeoB6QHq
-        A/IBawFwAW4GAAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNAGk
-        AWUBNAGkAWUBNAGkAWUBNAGkAWUBNDwAAQYBmgFOAQYBmgFOAUUB2QGsAWcB7wGvAVAB6QGhASQB2wGg
-        ASQB2wGgASQB2wGgASQB2wGgARYB0gFzARYB0gFzAWwB8wGuAQYBmgFOAQABhAF3AWsBcAFuAfwB+wH8
-        AuwB6wGLAWcBOAGLAWcBOAGLAWcBOAGLAWcBOAHKAacBeQG9AZIBWAGLAWcBOAGLAWcBOAGLAWcBOAGL
-        AWcBOAPsA/MBawFwAW4SAAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNEsAAQYBmgFOAQYBmgFOAQwBmwGP
-        AUkB3gGpAWoB8QGuAWsB8gGuAXMB9QGzAWEB7wGmARYB0gFzAWwB8wGuAQYBmgFOAQYBmgFOAwABawF1
-        AXID/QPuA+0B3gHiAd8BsAGYAXcBiwFnATgBygGnAXkBzgGzAY8BjgFrAT0BwwG8AawB7gLtAu4C7QHu
-        Ae0B8wH0AfMBawFwAW4SAAGkAWUBNAHmAc4BtwHmAc4BtwGkAWUBNFEAAQYBmgFOAQYBmgFOAQYBmgFO
-        AQYBmgFOAQYBmgFOAWwB8wGuAWwB8wGuAQYBmgFOAQYBmgFOBgABbgFxAWsB3QHmAeID/wHWAeEC3QHW
-        AckBtgGZAW4BiwFnATgB4gHLAasB0wG3AZIBmwF9AVQB5QHfAdUJ/wP0AWsBcAFuEgABpAFlATQB5gHO
-        AbcB5gHOAbcBpAFlATRdAAEGAZoBTgFsAfMBrgEGAZoBTgEGAZoBTgkAAYgBfwFrAXMBcQFmAXUBcAFi
-        AYUBbQFKAZoBdAFBAZ8BeAFEAdkBvwGeAesB2QHBAa8BhgFRAX0BagFOAWsBcAFuAWsBcAFuAWsBcAFu
-        AWsBcAFuAWsBcAFuAWsBcAFuEgABpAFlATQBpAFlATQBpAFlATQBpAFlATRdAAEGAZoBTgEGAZoBTgEG
-        AZoBTgwAAZIBcAFCAbsBlgFiAdEBrQGBAeYBzgGxAe8B3wHQAewB2wHFAd8BwgGbAaABiwFoAYgBbgFD
-        AVoBfwFqjQABBgGaAU4BBgGaAU4PAAF3AYUBbAGRAXkBTQGLAWcBOAGLAWcBOAGLAWcBOAGLAWcBOAGK
-        AWkBPQGAAXEBSgF6AXgBWKUAAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFu
-        AWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuAWsBcAFuUQABGAGm
-        AcMBGgGnAcQBAAGgAcQGAAOeJIEDngYAAWsBcAFuA90J3AbVFc8DygFrAXABbgGJAWABPgGkAWUBNAGk
-        AWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGkAWUBNAGk
-        AWUBNAGkAWUBNAGGAWABPyUAAaABxAFmAdsB6gERAaYBwgYAA4Ek/wOBBgABawFwAW4DzQPDAakCqgO0
-        A8IDxAPIA8sBqAGnAagD0QKnAagD0QK2AbcDygFrAXABbgFTAVcBVQGpAasBqQHXAa8BiQHNAZsBawHN
-        AZoBawHNAZoBagHNAZkBaQHNAZgBaAHMAZgBZgHNAZgBZQHMAZcBZQHMAZYBZAHMAZUBYwHeAboBmgGW
-        AXEBUwF5AV0BRSIAAaABxAFDAcQB2wFDAcUB2AEjAaYBwAMAA4ED/wbtA+4G7wbwA/EG8gP/A4EGAAFr
-        AXABbgPOA8UDnwOvA7wDxAPIA9ADqQPSA6kD0gO5A8oBawFwAW4BUwFXAVUBvwLAAZsBdgFYAd0BuwGb
-        Ac4BngFwAc8BnQFwAc4BnQFuAc4BnAFuAc4BnAFtAc4BmwFsAc0BmwFrAc4BmgFqAc0BmQFpAc0BmQFo
-        AdsBtgGUAaQBZQE0EwABoAHEDwABDgGqAcsBXQHaAekBIwGmAcADAAOBA/8G7QbuA+8G8AbxA/ID/wOB
-        BgABawFwAW4DzgzJA8UGyQ/FA9YBawFwAW4BUwFXAVUDyQGkAWUBNAHjAccBrQHXAbABiwHYAbEBjAHX
-        AbABiwHXAa8BigHWAa4BiAHVAawBhQHUAakBgQHSAaYBfAHQAaIBdgHPAZ8BcgHdAbsBnAGkAWUBNBAA
-        AaABxAEAAaABxA0AAZ4BwQECAawByAGIAecB8gERAaIBwgMAA4ED/wPsA+0G7gbvA/AJ8QP/A4EGAAFr
-        AXABbgP+Ff8G9AbrA+MD8AFrAXABbgFTAVcBVQG/AsABpAFlATQB4wHHAa4B2AGxAYwB2AGxAYwB2AGx
-        AYwB2AGxAYwB2AGxAYwB2AGxAYwB2AGxAYwB2AGxAYwB2AGxAYwB1gGuAYkB4AHCAaYBpAFlATQJAAEF
-        AXkBfQEAAaABxAF2Ae0B+wEAAaABxAcAAaABxAEAAZkBuQEAAaABxAFtAeYB9QF2AeIB7wEZAaMBwQMA
-        A4ED/wbsBu0G7gbvBvAD/wOBBgABawFwAW4D9wPjA+4G+gHIAdQBzgGOAWwBPwGLAWcBOAG0Aa4BmgP6
-        A/wD7gPjA/ABawFwAW4BUwFXAVUDyQGkAWUBNAHrAdgBxgHoAdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHo
-        AdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHoAdIBvgHrAdgBxgGkAWUBNAYAAQUBeQF9AQABoAHE
-        AXYB7QH7AXYB7QH7AQABoAHEAQABoAHEAQABoAHEAQABoAHEAQEBqQHEAW4B4QHuAQ8ByQHfAWkB5AHy
-        ARoBpAHAAwADgQP/BuwG7QbuCe8D8AP/A4EGAAFrAXABbgP5A+4D+gPkAb8BywHFAYsBZwE4AeMBywGs
-        AdwBvwGYAY8BawE7AawBpgGSA+QD+gPuA/EBawFwAW4BUwFXAVUBvwLAAZoBegFhAaQBZQE0AaQBZQE0
-        AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0AaQBZQE0
-        AZ0BawFDAwABBQF5AX0BAAGgAcQBdgHtAfsBBAHDAdoBdgHtAfsBaQHqAfkBaQHqAfkBaQHqAfkBaQHq
-        AfkBBQHdAfcBCgHIAd8BBwHCAdgBbwHcAesBGwGjAb8DAAOBA/8D6wbsBu0G7gHiAu4BsQHwAfMBkgHw
-        AfUBmgHwAfUBdwKWBgABawFwAW4D+QP6A+QBvwHLAcUBiwFnATgB3AG/AZgBwAGfAXMBwAGfAXMB3wHI
-        AasBiwFnATgBrAGmAZID5AP0A/EBawFwAW4BVwFbAVkDyQamAaQBqQGnA/8B9AL1AcoCzAHKAswBygLM
-        AdcC2AH0AvUB9AL1A/8BpAGpAacDAAEFAXkBfgEAAaABxAF5Ae0B+wEyAeIB+AEsAd8B9AEEAcAB1gEE
-        AcAB1gEEAcAB1gEdAdIB6AEdAdIB6AEdAdIB6AELAcgB3wFqAeUB8wEbAasBxQEVAaABvAMAA4ED/wbr
-        BuwG7QHgAe4B7wGWAe8B9AFjAfEB+AFGAfMB+wFFAfMB+wFdAe8B9wE2Ad0B5gMAAWsBcAFuA/oB6gLp
-        AcQBzwHKAYsBZwE4AdwBvwGYAb8BnwFxAb8BnwFxAb8BnwFxAcABnwFzAdgBuwGWAYsBZwE4Aa8BqQGV
-        AeoB6QHqA/IBawFwAW4BWwFfAV0BvwLAAZUBlwGWAZUBlwGWAaQBqQGnA/8B9AL1AfQC9QH0AvUB9AL1
-        AfQC9QH0AvUB9AL1A/8BpAGpAacEAAGgAcQBrQHzAfsBLwHgAfYBMgHiAfgBMgHiAfcBMgHiAfcBLwHg
-        AfUBKQHbAfEBHQHSAegBHQHSAegBHQHSAegBNgHZAewBQAHNAeEBFgGhAb0BBQF5AX0DAAOBA/8G6wns
-        A+0BsQHuAfEBZwHxAfgBQAH0Af0BcQH3Af0BcgH3Af0BQwHzAfwBJAHsAfYBCgHzAf8BawFwAW4B/AH7
-        AfwC7AHrAYsBZwE4AYsBZwE4AYsBZwE4AYsBZwE4AcoBpwF5Ab0BkgFYAYsBZwE4AYsBZwE4AYsBZwE4
-        AYsBZwE4A+wD8wFrAXABbgFbAV8BXQPJBqYBpAGpAacD/wH0AvUBygLMAcoCzAHKAswBygLMAcoCzAH0
-        AvUD/wGkAakBpwMAAQUBeQF9AQABoAHEAa0B8wH7AS8B4AH2ATIB4gH3ASkB2wHxAS8B4AH1ASkB2wHx
-        ARYBzQHjATYB2QHsAWkB5wH2AUEBzgHjARMBowHBAQUBeQF9BgADgQP/A+oG6wnsAZsB7wHzAU4B8gH6
-        AWoB9gH9AbsB+gH+Ab8B+wH+AW4B9gH9ASIB8AH6AQ0B8wH/AWsBdQFyA/0D7gPtAd4B4gHfAbABmAF3
-        AYsBZwE4AcoBpwF5Ac4BswGPAY4BawE9AcMBvAGsAe4C7QLuAu0B7gHtAfMB9AHzAWsBcAFuAV8BYwFh
-        Ab8CwAGVAZcBlgGVAZcBlgGkAakBpwP/AfQC9QH0AvUB9AL1AfQC9QH0AvUB9AL1AfQC9QP/AaQBqQGn
-        BgABBQF5AX0BAAGgAcQBrQHzAfsBMQHhAfYBIAHjAfoBcwHsAfoBbwHrAfoBbgHoAfcBbAHoAfcBFAGh
-        AbwBFAGjAcEBBQF5AX0JAAOBA/8G6gbrBuwBnAHuAfIBTgHyAfoBZwH2Af0BtQH6Af4BuAH6Af4BawH1
-        Af0BIgHvAfoBDQHzAf8BbgFxAWsB3QHmAeID/wHWAeEC3QHWAckBtgGZAW4BiwFnATgB4gHLAasB0wG3
-        AZIBmwF9AVQB5QHfAdUJ/wP0AWsBcAFuAWUBaQFnA8kGpgGkAakBpxv/AaQBqQGnCQABBQF5AX0BAAGg
-        AcQBrQHzAfsBJQHkAfsBAAGgAcQBAAGgAcQBEwGhAb4BFQGfAbsBGwGhAbsBBgF6AXwMAAOBA/8D7Abq
-        CesBtAHtAfABagHwAfcBOgH0AfwBaAH2Af0BagH2Af0BPAHyAfsBHgHvAfkBCQHzAf8BiAF/AWsBcwFx
-        AWYBdQFwAWIBhQFtAUoBmgF0AUEBnwF4AUQB2QG/AZ4B6wHZAcEBrwGGAVEBfQFqAU4BawFwAW4BawFw
-        AW4BawFwAW4BawFwAW4BawFwAW4BawFwAW4BaAFsAWoBvwLAAZUBlwGWAZUBlwGWAZgBnAGaAaQBqQGn
-        AaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAaQBqQGnAZIBmQGWDAABBQF5
-        AX0BAAGgAcQBrQHzAfsBAAGgAcQbAAOBGP8BmwHuAfIBaQHwAfcBTQHyAfoBRgHvAfcBKAHrAfQBDQHz
-        Af8DAAGSAXABQgG7AZYBYgHRAa0BgQHmAc4BsQHvAd8B0AHsAdsBxQHfAcIBmwGgAYsBaAGIAW4BQwFa
-        AX8BahIAAWsBbwFtEs4BxQLGAWEBZQFjAVMBVwFVHwABnQG/AQABoAHEAQABoAHEGwADnhiBAXwCjAFy
-        Ap8BagGuAa8BNgHkAe0BCQHzAf8BAgHzAf8DAAF3AYUBbAGRAXkBTQGLAWcBOAGLAWcBOAGLAWcBOAGL
-        AWcBOAGKAWkBPQGAAXEBSgF6AXgBWBUAAVMBVwFVAWsBbwFtAWsBbwFtAWsBbwFtAWsBbwFtAWsBbwFt
-        AWUBaQFnAWUBaQFnAV8BYgFhKAABoAHEGwABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEB
-        FgAD/wEAAcMB/wIAAv8CAAGDAf8CAAL/AgABhwH/AgAB/AE/AgABjwGfAgAB/AE/AgABhwGPAgAB/AE/
-        AgABgQGHAgAB/AE/AgABgAEDAgABwAEDAgABgAEBAgABwAEDAgABgAMAAcABAwIAAYADAAHAAQMCAAHA
-        AwAB/AE/AgAB4AEBAgAB/AE/AgAB+AEDAgAB/AE/AgAB/wGHAgAB/AE/AgAB/wGPAQABPwL/AgAB/wGf
-        AQABfwL/AgAC/wIAA/8B4wEAAQMDAAEBAf8B4wEAAQMEAAH/AeEBAAEDBAAB/QHxAQABAwQAAfkB4QEA
-        AQMEAAHhAYEBAAEDBAABwAEBAQABAwQAAYABAQEAAQMDAAEBAQABAQEAAQEDAAEBAQABAQUAAQEBAAED
-        BQABAQGAAQcFAAEBAcABDwUAAQEB4QH/AQABAQEAAT8BAAE/AfEB/wEAAQEBAAF/AQABfwH9Af8L
-</value>
-  </data>
   <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>334, 17</value>
   </metadata>

--- a/IBBoard.WarFoundry.GUI.WinForms.csproj	Sat Mar 06 16:33:28 2010 +0000
+++ b/IBBoard.WarFoundry.GUI.WinForms.csproj	Sat Mar 06 21:09:02 2010 +0000
@@ -100,11 +100,6 @@
       <Project>{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
     </ProjectReference>
-    <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj">
-      <Name>IBBoard.WarFoundry.API</Name>
-      <Project>{59EC117B-F955-44D5-8461-8F44F3A7481A}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.ico" />
@@ -228,6 +223,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj">
+      <Project>{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}</Project>
+      <Name>IBBoard.WarFoundry.API</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>