diff --git a/PackageBuild.bat b/PackageBuild.bat
index 7bd370d0d..7f7591120 100644
--- a/PackageBuild.bat
+++ b/PackageBuild.bat
@@ -1,6 +1,7 @@
 @echo off
 
 @if "%1"=="" goto no_arg
+@if "%~2"=="Any CPU" goto eof
 
 set BUILD_PATH=build\win32\%1\
 
@@ -16,6 +17,7 @@ set EXPORT_ZIP=export\%1.zip
 @call %ZIP_APP% a %EXPORT_ZIP% COPYING README.md
 cd %BUILD_PATH%
 @call ..\..\..\%ZIP_APP% u ..\..\..\%EXPORT_ZIP% Cxbx.exe glew32.dll subhook.dll
+@call ..\..\..\%ZIP_APP% u ..\..\..\%EXPORT_ZIP% CxbxDebugger.exe capstone.dll cs_x86.dll
 cd /d %~dp0
 echo Finished packaging %EXPORT_ZIP%!
 goto eof
diff --git a/appveyor.yml b/appveyor.yml
index eb47c60c3..b583031e0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,41 @@
+# Documentation is here: https://www.appveyor.com/docs/appveyor-yml/
+
 init:
   - ps: Update-AppveyorBuild -Version "$env:appveyor_repo_commit"
+
 branches:
   only:
-  - master
+    - master
+
 image: 
-- Visual Studio 2017  
+  - Visual Studio 2017
+
 configuration:
-- Release
-- Debug
+  # The builds are run in this order
+  # Each configuration will compile all below platforms
+  - Release
+  - Debug
+
+platform:
+  # Build the debugger and managed deps
+  # This must be done first!
+  - Any CPU
+  # Build native binaries
+  - Win32
+
 build:
   project: build/win32/Cxbx.sln
   parallel: true
   verbosity: minimal
+
 after_build:
-  - cmd: PackageBuild.bat %CONFIGURATION%
+  # Pass in the build configuration and current platform
+  # The packager script does not need to gather during the "Any CPU" stage and will early-out
+  - cmd: PackageBuild.bat %CONFIGURATION% "%PLATFORM%"
+
 artifacts:
-- path: export/*.zip
+  - path: export/*.zip
+
 install:
-  # Git clone happens between init and install 
+  # Git clone happens between init and install
   - cmd: git submodule update --init --recursive
diff --git a/build/win32/Cxbx.sln b/build/win32/Cxbx.sln
index e6cbf0fc5..3f82208c0 100644
--- a/build/win32/Cxbx.sln
+++ b/build/win32/Cxbx.sln
@@ -52,25 +52,21 @@ Global
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Win32.Build.0 = Debug|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Win32.ActiveCfg = Release|Any CPU
-		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Win32.Build.0 = Release|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|x64.Build.0 = Release|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Win32.Build.0 = Debug|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Win32.ActiveCfg = Release|Any CPU
-		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Win32.Build.0 = Release|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|x64.ActiveCfg = Release|Any CPU
 		{9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|x64.Build.0 = Release|Any CPU
 		{2171C0E8-4915-49B9-AC23-A484FA08C126}.Debug|Any CPU.ActiveCfg = Debug|Win32