diff --git a/source/vcpp/cube.sln b/source/vcpp/cube.sln
index 8fa40bc5..57242d6c 100644
--- a/source/vcpp/cube.sln
+++ b/source/vcpp/cube.sln
@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cube", "cube.vcproj", "{1FAF5BB4-C49A-4124-9F23-188528BAE7C8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wizard", "..\wizard\vcpp\wizard.vcproj", "{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -23,14 +21,6 @@ Global
 		{1FAF5BB4-C49A-4124-9F23-188528BAE7C8}.Standalone Debug|Win32.Build.0 = Standalone Debug|Win32
 		{1FAF5BB4-C49A-4124-9F23-188528BAE7C8}.Standalone Release|Win32.ActiveCfg = Standalone|Win32
 		{1FAF5BB4-C49A-4124-9F23-188528BAE7C8}.Standalone Release|Win32.Build.0 = Standalone|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Debug|Win32.Build.0 = Debug|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Profile|Win32.ActiveCfg = Release|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Profile|Win32.Build.0 = Release|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Release|Win32.ActiveCfg = Release|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Standalone Debug|Win32.ActiveCfg = Debug|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Standalone Release|Win32.ActiveCfg = Release|Win32
-		{CE6FFAA3-DBA7-4D33-9DD0-C46AB4550775}.Standalone Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo
index 3e2cea05..f5f8e63e 100644
Binary files a/source/vcpp/cube.suo and b/source/vcpp/cube.suo differ
diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj
index 72e81d7f..b5558848 100644
--- a/source/vcpp/cube.vcproj
+++ b/source/vcpp/cube.vcproj
@@ -83,7 +83,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ogg.lib libvorbisfile.lib openal32.lib efx-util.lib odbc32.lib odbccp32.lib zdll.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib"
 				OutputFile="../../bin_win32/ac_client.exe"
 				LinkIncremental="1"
@@ -188,7 +187,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib"
 				OutputFile="../../bin_win32/ac_client.exe"
 				LinkIncremental="2"
@@ -296,7 +294,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386 /PROFILE"
+				AdditionalOptions="/PROFILE"
 				AdditionalDependencies="msvcrt.lib zdll.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib SDL_mixer.lib winmm.lib"
 				OutputFile="..\..\bin_win32\ac_client.exe"
 				LinkIncremental="1"
@@ -402,8 +400,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zdll.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib zdll.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib LIBCPMT.LIB"
 				OutputFile="../../bin_win32/ac_server.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -500,8 +497,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib zdll.lib opengl32.lib glu32.lib msvcrtd.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib zdll.lib opengl32.lib glu32.lib msvcrtd.lib SDLmain.lib SDL.lib ws2_32.lib winmm.lib Dbghelp.lib"
 				OutputFile="../../bin_win32/ac_server.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -698,6 +694,14 @@
 				RelativePath="..\src\weapon.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\winserviceinstaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\wizard\src\winserviceinstaller.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\world.h"
 				>
@@ -743,94 +747,22 @@
 			Name="docs"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
-			<File
-				RelativePath="..\..\docs\basics.xml"
-				>
-			</File>
 			<File
 				RelativePath="..\ChangeLog.txt"
 				>
 			</File>
-			<File
-				RelativePath="..\..\docs\commandline.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\commonfaqs.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\cubeengine.xml"
-				>
-			</File>
 			<File
 				RelativePath="..\..\docs\cuberef.txt"
 				>
 			</File>
-			<File
-				RelativePath="..\..\docs\cubescript.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\getstarted.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\history.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\interface.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\introduction.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\knownissues.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\maneuvers.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\mapediting1.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\mapediting2.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\mapediting3.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\mapediting4.xml"
-				>
-			</File>
-			<File
-				RelativePath="..\..\docs\mapediting5.xml"
-				>
-			</File>
 			<File
 				RelativePath="..\..\docs\package_copyrights.txt"
 				>
 			</File>
-			<File
-				RelativePath="..\..\docs\performanceguide.xml"
-				>
-			</File>
 			<File
 				RelativePath="..\readme.txt"
 				>
 			</File>
-			<File
-				RelativePath="..\..\docs\README.xml"
-				>
-			</File>
 			<File
 				RelativePath="..\..\docs\reference.xml"
 				>
@@ -839,10 +771,6 @@
 				RelativePath="..\roadmap.txt"
 				>
 			</File>
-			<File
-				RelativePath="..\..\docs\server.xml"
-				>
-			</File>
 			<File
 				RelativePath="..\..\docs\autogen\win32_cubedoc2xhtml.ps1"
 				>
@@ -1980,6 +1908,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\wizard.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 		<Filter
 			Name="cfg"