diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index c1df95be2..4ee038a13 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -88,7 +88,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Docs", "..\Docs", "{67E7DEF
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "1747"
+		VWDPort = "49612"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Compiler.Debug", "..\source2\IL2CPU\Cosmos.IL2CPU.Debug\Cosmos.Compiler.Debug.csproj", "{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}"
diff --git a/source2/VSIP/Cosmos.VS.Windows/AssemblyTW.cs b/source2/VSIP/Cosmos.VS.Windows/AssemblyTW.cs
index b344abc56..d1b8c9d2c 100644
--- a/source2/VSIP/Cosmos.VS.Windows/AssemblyTW.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/AssemblyTW.cs
@@ -7,6 +7,7 @@ using System.Windows;
 using System.Runtime.InteropServices;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell;
+using System.ComponentModel.Design;
 
 namespace Cosmos.Cosmos_VS_Windows
 {
@@ -26,6 +27,7 @@ namespace Cosmos.Cosmos_VS_Windows
 
         public AssemblyTW() : base(null)
         {
+            this.ToolBar = new CommandID(GuidList.guidAsmToolbarCmdSet, (int)PkgCmdIDList.AsmToolbar);
             this.Caption = "Cosmos Assembly Window";
 
             // Set the image that will appear on the tab of the window frame
diff --git a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
index 4dcda5626..968c78885 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
+++ b/source2/VSIP/Cosmos.VS.Windows/Cosmos.VS.Windows.vsct
@@ -42,6 +42,13 @@
           <CommandName>Cosmos Debugger Toolbar</CommandName>
         </Strings>
       </Menu>
+      <Menu guid="guidAsmToolbarCmdSet" id="AsmToolbar" type="ToolWindowToolbar" >
+        <CommandFlag>DefaultDocked</CommandFlag>
+        <Strings>
+          <ButtonText>Cosmos Assembly Toolbar</ButtonText>
+          <CommandName>Cosmos Assembly Toolbar</CommandName>
+        </Strings>
+      </Menu>
     </Menus>
     <!-- In this section you can define new menu groups. A menu group is a container for 
          other menus or buttons (commands); from a visual point of view you can see the 
@@ -51,6 +58,9 @@
       <Group guid="guidIDEToolbarCmdSet" id="ToolbarGroup" priority="0x0000">
         <Parent guid="guidIDEToolbarCmdSet" id="Toolbar"/>
       </Group>
+      <Group guid="guidAsmToolbarCmdSet" id="AsmToolbarGroup" priority="0x0000">
+        <Parent guid="guidAsmToolbarCmdSet" id="AsmToolbar"/>
+      </Group>
     </Groups>
 
     <!--Buttons section. -->
@@ -129,6 +139,30 @@
           <ButtonText>Show All Cosmos Debug Windows</ButtonText>
         </Strings>
       </Button>
+      <Button guid="guidAsmToolbarCmdSet" id="cmdidAsmFilter" priority="0x0100" type="Button">
+        <Parent guid="guidAsmToolbarCmdSet" id="AsmToolbarGroup"/>
+        <Icon guid="guidImages" id="bmpAllIcon" />
+        <Strings>
+          <CommandName>cmdidAsmFilter</CommandName>
+          <ButtonText>Filter Assembly Labels</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidAsmToolbarCmdSet" id="cmdidAsmStep" priority="0x0100" type="Button">
+        <Parent guid="guidAsmToolbarCmdSet" id="AsmToolbarGroup"/>
+        <Icon guid="guidImages" id="bmpAllIcon" />
+        <Strings>
+          <CommandName>cmdidAsmStep</CommandName>
+          <ButtonText>Step</ButtonText>
+        </Strings>
+      </Button>
+      <Button guid="guidAsmToolbarCmdSet" id="cmdidAsmCopy" priority="0x0100" type="Button">
+        <Parent guid="guidAsmToolbarCmdSet" id="AsmToolbarGroup"/>
+        <Icon guid="guidImages" id="bmpAllIcon" />
+        <Strings>
+          <CommandName>cmdidAsmCopy</CommandName>
+          <ButtonText>Copy Assembly</ButtonText>
+        </Strings>
+      </Button>
     </Buttons>
    
     <!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
@@ -150,9 +184,15 @@
       <IDSymbol name="Toolbar" value="0x1000" />
       <IDSymbol name="ToolbarGroup" value="0x1050" />
     </GuidSymbol>
+    <GuidSymbol name ="guidAsmToolbarCmdSet" value="{A875EA24-689A-4EAB-B9C2-DAC3EACB9501}">
+      <IDSymbol name ="AsmToolbar" value="0x1001" />
+      <IDSymbol name ="AsmToolbarGroup" value="0x1002" />
+      <IDSymbol name ="cmdidAsmFilter" value="0x0105" />
+      <IDSymbol name ="cmdidAsmStep" value="0x0106" />
+      <IDSymbol name ="cmdidAsmCopy" value="0x0107" />
+    </GuidSymbol>
     <!-- This is the guid used to group the menu commands together -->
     <GuidSymbol name="guidCosmos_VS_WindowsCmdSet" value="{3d4b3f35-36e7-4cea-8acc-d9601e45c0b9}">
-      <IDSymbol name="MyMenuGroup" value="0x1020" />
       <IDSymbol name="cmdidCosmosAssembly" value="0x0101" />
       <IDSymbol name="cmdidCosmosRegisters" value="0x0102" />
       <IDSymbol name="cmdidCosmosStack" value="0x0103" />
diff --git a/source2/VSIP/Cosmos.VS.Windows/Guids.cs b/source2/VSIP/Cosmos.VS.Windows/Guids.cs
index c05c95677..4315d2903 100644
--- a/source2/VSIP/Cosmos.VS.Windows/Guids.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/Guids.cs
@@ -9,7 +9,9 @@ namespace Cosmos.Cosmos_VS_Windows
         public const string guidCosmos_VS_WindowsPkgString = "a82b45e9-2a89-43bd-925d-c7f0edd212aa";
         public const string guidCosmos_VS_WindowsCmdSetString = "3d4b3f35-36e7-4cea-8acc-d9601e45c0b9";
         public const string guidToolWindowPersistanceString = "f019fb29-c2c2-4d27-9abf-739533c939be";
+        public const string guidAsmToolbarCmdSetString = "A875EA24-689A-4EAB-B9C2-DAC3EACB9501";
 
         public static readonly Guid guidCosmos_VS_WindowsCmdSet = new Guid(guidCosmos_VS_WindowsCmdSetString);
+        public static readonly Guid guidAsmToolbarCmdSet = new Guid(guidAsmToolbarCmdSetString);
     };
 }
\ No newline at end of file
diff --git a/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs b/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs
index 9f8ca1900..92c86c009 100644
--- a/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/PkgCmdID.cs
@@ -10,5 +10,10 @@ namespace Cosmos.Cosmos_VS_Windows
         public const uint cmdidCosmosRegisters = 0x102;
         public const uint cmdidCosmosStack = 0x103;
         public const uint cmdidCosmosShowAll = 0x104;
+        public const uint cmdidAsmFilter = 0x0105;
+        public const uint cmdidAsmStep = 0x0106;
+        public const uint cmdidAsmCopy = 0x0107;
+        public const int AsmToolbar = 0x1001;
+        public const uint AsmToolbarGroup = 0x1002;
     };
 }
\ No newline at end of file