diff --git a/BizHawk.Installer/BizHawk.Installer.sln b/BizHawk.Installer/BizHawk.Installer.sln
new file mode 100644
index 0000000000..8bce7720d5
--- /dev/null
+++ b/BizHawk.Installer/BizHawk.Installer.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BizHawk.Installer", "BizHawk.Installer.wixproj", "{A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Bootstrap", "Bootstrap.wixproj", "{7A25308C-44B8-4897-9150-DF2C77F85094}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Debug|x86.ActiveCfg = Debug|x86
+ {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Debug|x86.Build.0 = Debug|x86
+ {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Release|x86.ActiveCfg = Release|x86
+ {A1A56BC8-8199-4C8D-B5C9-76401D3A0A70}.Release|x86.Build.0 = Release|x86
+ {7A25308C-44B8-4897-9150-DF2C77F85094}.Debug|x86.ActiveCfg = Debug|x86
+ {7A25308C-44B8-4897-9150-DF2C77F85094}.Debug|x86.Build.0 = Debug|x86
+ {7A25308C-44B8-4897-9150-DF2C77F85094}.Release|x86.ActiveCfg = Release|x86
+ {7A25308C-44B8-4897-9150-DF2C77F85094}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/BizHawk.Installer/BizHawk.Installer.suo b/BizHawk.Installer/BizHawk.Installer.suo
new file mode 100644
index 0000000000..0f4ae29e94
Binary files /dev/null and b/BizHawk.Installer/BizHawk.Installer.suo differ
diff --git a/BizHawk.Installer/BizHawkFiles.wxs b/BizHawk.Installer/BizHawkFiles.wxs
index 03589e4b02..636fd7c760 100644
--- a/BizHawk.Installer/BizHawkFiles.wxs
+++ b/BizHawk.Installer/BizHawkFiles.wxs
@@ -12,7 +12,7 @@
-
+
@@ -22,660 +22,660 @@
-
+
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
-
+
-
+
-
+
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/BizHawk.Installer/BizHawkInstall.wxs b/BizHawk.Installer/BizHawkInstall.wxs
index 2f0b437c50..553ccb7056 100644
--- a/BizHawk.Installer/BizHawkInstall.wxs
+++ b/BizHawk.Installer/BizHawkInstall.wxs
@@ -11,10 +11,10 @@
-
-
+
+
-
+
@@ -23,13 +23,13 @@
-
+
-
-
+
@@ -43,11 +43,11 @@
-
+
-
+
@@ -58,7 +58,7 @@
-
+
diff --git a/BizHawk.Installer/Bootstrap.wixproj b/BizHawk.Installer/Bootstrap.wixproj
new file mode 100644
index 0000000000..9db0b1f011
--- /dev/null
+++ b/BizHawk.Installer/Bootstrap.wixproj
@@ -0,0 +1,55 @@
+
+
+
+ Debug
+ x86
+ 3.9
+ {7a25308c-44b8-4897-9150-df2c77f85094}
+ 2.0
+ Bizhawk.Install
+ Bundle
+ $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets
+ $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets
+
+
+ bin\$(Configuration)\
+ obj\$(Configuration)\
+ Debug
+
+
+ bin\$(Configuration)\
+ obj\$(Configuration)\
+
+
+
+
+
+
+ $(WixExtDir)\WixBalExtension.dll
+ WixBalExtension
+
+
+ $(WixExtDir)\WixNetFxExtension.dll
+ WixNetFxExtension
+
+
+
+
+ BizHawk.Installer
+ {a1a56bc8-8199-4c8d-b5c9-76401d3a0a70}
+ True
+ True
+ Binaries;Content;Satellites
+ INSTALLFOLDER
+
+
+
+
+
\ No newline at end of file
diff --git a/BizHawk.Installer/Bootstrap.wxs b/BizHawk.Installer/Bootstrap.wxs
new file mode 100644
index 0000000000..5d47de7c3f
--- /dev/null
+++ b/BizHawk.Installer/Bootstrap.wxs
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file