diff --git a/source/Cosmos.Build.Windows/App.xaml b/source/Cosmos.Build.Windows/App.xaml
new file mode 100644
index 000000000..735f6f06c
--- /dev/null
+++ b/source/Cosmos.Build.Windows/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Cosmos.Build.Windows.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    StartupUri="Window1.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/source/Cosmos.Build.Windows/App.xaml.cs b/source/Cosmos.Build.Windows/App.xaml.cs
new file mode 100644
index 000000000..495e594d5
--- /dev/null
+++ b/source/Cosmos.Build.Windows/App.xaml.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace Cosmos.Build.Windows {
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application {
+    }
+}
diff --git a/source/Cosmos.Build.Windows/Builder.cs b/source/Cosmos.Build.Windows/Builder.cs
index 701c9734e..bd98a23e1 100644
--- a/source/Cosmos.Build.Windows/Builder.cs
+++ b/source/Cosmos.Build.Windows/Builder.cs
@@ -1,15 +1,14 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 
 namespace Cosmos.Build.Windows {
     public class Builder {
         //TODO: Fix this - config file? Package format?
-        //protected const string mCosmosPath = @"s:\source\il2cpu\";
-		protected const string mCosmosPath = @"D:\dotnet\IL2ASM\repos\";
+        protected const string mCosmosPath = @"s:\source\il2cpu\";
         protected string mBuildPath;
 
         public Builder() {
diff --git a/source/Cosmos.Build.Windows/Cosmos.Build.Windows.csproj b/source/Cosmos.Build.Windows/Cosmos.Build.Windows.csproj
index cc49b5baf..5d63faf3e 100644
--- a/source/Cosmos.Build.Windows/Cosmos.Build.Windows.csproj
+++ b/source/Cosmos.Build.Windows/Cosmos.Build.Windows.csproj
@@ -5,8 +5,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EF1F8912-AE8D-40B3-9857-5A2852986710}</ProjectGuid>
-    <OutputType>library</OutputType>
+    <ProjectGuid>{1F0EDE86-F6D4-4355-9A97-10E90457770C}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Cosmos.Build.Windows</RootNamespace>
     <AssemblyName>Cosmos.Build.Windows</AssemblyName>
@@ -49,18 +49,27 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Window1.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Window1.xaml.cs">
+      <DependentUpon>Window1.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Builder.cs" />
@@ -77,9 +86,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="TypeSelectWindow.xaml.cs">
-      <DependentUpon>TypeSelectWindow.xaml</DependentUpon>
-    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -96,12 +102,6 @@
       <Name>IL2CPU %28IL2CPU\IL2CPU%29</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="TypeSelectWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/source/Cosmos.Build.Windows/Window1.xaml b/source/Cosmos.Build.Windows/Window1.xaml
new file mode 100644
index 000000000..3baf8775e
--- /dev/null
+++ b/source/Cosmos.Build.Windows/Window1.xaml
@@ -0,0 +1,8 @@
+<Window x:Class="Cosmos.Build.Windows.Window1"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Title="Window1" Height="300" Width="300">
+    <Grid>
+        
+    </Grid>
+</Window>
diff --git a/source/Cosmos.Build.Windows/Window1.xaml.cs b/source/Cosmos.Build.Windows/Window1.xaml.cs
new file mode 100644
index 000000000..129e139ed
--- /dev/null
+++ b/source/Cosmos.Build.Windows/Window1.xaml.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Cosmos.Build.Windows {
+    /// <summary>
+    /// Interaction logic for Window1.xaml
+    /// </summary>
+    public partial class Window1 : Window {
+        public Window1() {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 46cb4fe3e..37a4db86d 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -61,9 +61,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boots", "Boots", "{21E68B7D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Old", "Old", "{86BD557B-49D1-4833-B1F7-D38BF21A87EA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Windows", "Cosmos.Build.Windows\Cosmos.Build.Windows.csproj", "{1F0EDE86-F6D4-4355-9A97-10E90457770C}"
+EndProject
 Global
 	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 25
+		SccNumberOfProjects = 26
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = https://tfs04.codeplex.com/
 		SccLocalPath0 = .
@@ -163,6 +165,10 @@ Global
 		SccProjectTopLevelParentUniqueName24 = Cosmos.sln
 		SccProjectName24 = Cosmos/Cosmos.Tools.SkypeBot
 		SccLocalPath24 = Cosmos\\Cosmos.Tools.SkypeBot
+		SccProjectUniqueName25 = Cosmos.Build.Windows\\Cosmos.Build.Windows.csproj
+		SccProjectTopLevelParentUniqueName25 = Cosmos.sln
+		SccProjectName25 = Cosmos.Build.Windows
+		SccLocalPath25 = Cosmos.Build.Windows
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -267,6 +273,10 @@ Global
 		{B0BBD2A2-4FAA-4730-9770-ACE6D9532132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0BBD2A2-4FAA-4730-9770-ACE6D9532132}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0BBD2A2-4FAA-4730-9770-ACE6D9532132}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F0EDE86-F6D4-4355-9A97-10E90457770C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F0EDE86-F6D4-4355-9A97-10E90457770C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F0EDE86-F6D4-4355-9A97-10E90457770C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F0EDE86-F6D4-4355-9A97-10E90457770C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -296,6 +306,7 @@ Global
 		{28584689-B678-4863-B404-0AD46B2F2B63} = {0D558E33-78B0-47DB-B5EF-B7C2F3114D75}
 		{A1F83D9F-2D44-4264-A08B-416797123018} = {0D558E33-78B0-47DB-B5EF-B7C2F3114D75}
 		{7BAB58BF-E8A1-4623-B6BF-4B90A0505226} = {0D558E33-78B0-47DB-B5EF-B7C2F3114D75}
+		{1F0EDE86-F6D4-4355-9A97-10E90457770C} = {0D558E33-78B0-47DB-B5EF-B7C2F3114D75}
 		{B0BBD2A2-4FAA-4730-9770-ACE6D9532132} = {E16DB75B-0F1D-4813-9103-F8FB6E7BAE2A}
 	EndGlobalSection
 EndGlobal