Index: /branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj	(revision 2505)
+++ /branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj	(revision 2506)
@@ -52,4 +52,5 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Exception.cs" />
+    <Compile Include="ExtensionPoints\IClientTool.cs" />
     <Compile Include="ExtensionPoints\IEntropySource.cs" />
     <Compile Include="ExtensionPoints\IErasureMethod.cs" />
@@ -69,4 +70,5 @@
     <Compile Include="ProgressManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Registrars\ClientToolRegistrar.cs" />
     <Compile Include="Registrars\EntropySourceRegistrar.cs" />
     <Compile Include="Registrars\ErasureMethodRegistrar.cs" />
Index: /branches/eraser6/pluginsRewrite/Eraser.Plugins/ExtensionPoints/IClientTool.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/ExtensionPoints/IClientTool.cs	(revision 2505)
+++ /branches/eraser6/pluginsRewrite/Eraser.Plugins/ExtensionPoints/IClientTool.cs	(revision 2506)
@@ -32,5 +32,5 @@
 	/// items within the Eraser Tools menu.
 	/// </summary>
-	class IClientTool : IRegisterable
+	public interface IClientTool : IRegisterable
 	{
 		/// <summary>
Index: /branches/eraser6/pluginsRewrite/Eraser/MainForm.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser/MainForm.cs	(revision 2505)
+++ /branches/eraser6/pluginsRewrite/Eraser/MainForm.cs	(revision 2506)
@@ -28,11 +28,16 @@
 using System.Text;
 using System.Windows.Forms;
-using Eraser.Util;
-using Eraser.Manager;
-using Eraser.Properties;
+
 using System.IO;
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.Serialization;
+
+using Eraser.Util;
+using Eraser.Manager;
+using Eraser.Plugins;
+using Eraser.Plugins.Registrars;
+using Eraser.Plugins.ExtensionPoints;
+using Eraser.Properties;
 
 namespace Eraser
@@ -56,4 +61,14 @@
 			Theming.ApplyTheme(this);
 			Theming.ApplyTheme(notificationMenu);
+
+			//We need to see if there are any tools to display
+			foreach (IClientTool tool in Host.Instance.ClientTools)
+				tool.RegisterTool(tbToolsMenu);
+			if (tbToolsMenu.Items.Count == 0)
+			{
+				//There are none, hide the menu
+				tbTools.Visible = false;
+				tbToolsDropDown.Visible = false;
+			}
 
 			//For every task we need to register the Task Started and Task Finished