diff --git a/.appveyor.yml b/.appveyor.yml
index c0540ad..7b807e4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,6 +17,8 @@ environment:
     NSIS_LOC: '"C:\Program Files (x86)\NSIS\"'
     ZIP_LOC: '"C:\Program Files\7-zip\7z.exe"'
     LLVM_LOC: '"C:\Program Files\LLVM\bin\"'
+    PYTHON: '"C:\Python37\"'
+    BUILD_PACKAGE: "1"
     BUILD_CLANG: '"1"'
     
 
diff --git a/build_scripts/win/__pycache__/common.cpython-37.pyc b/build_scripts/win/__pycache__/common.cpython-37.pyc
new file mode 100644
index 0000000..4061d4f
Binary files /dev/null and b/build_scripts/win/__pycache__/common.cpython-37.pyc differ
diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py
index 7d3e86c..78070f8 100644
--- a/build_scripts/win/build.py
+++ b/build_scripts/win/build.py
@@ -16,7 +16,7 @@ def package():
     ZIP_NAME = "AdvancedSettings-" + VERSION_STRING + ".7z"
 
     add_line_to_run_bat_file("@ECHO Starting 7zip:")
-    add_line_to_run_bat_file('"' + ZIP_LOC + '"' + " a -t7z " + get_project_dir() + "\\" + OUTPUT_DIR + "\\" + ZIP_NAME + " " + get_deploy_dir() + "\\*")
+    add_line_to_run_bat_file('"' + ZIP_LOC + '"' + " a -t7z " + get_project_dir() + "\\bin\\win64\\" + ZIP_NAME + " " + get_deploy_dir() + "\\*")
     add_error_handling_line_to_bat_file()
     add_line_to_run_bat_file("@ECHO 7zip done.")
     say("7zip added to file.")
@@ -59,7 +59,7 @@ def deploy():
                              + "\\qtdata --libdir " + get_deploy_dir()
                              + " --plugindir " + get_deploy_dir() + "\\qtdata\\plugins --no-system-d3d-compiler --no-opengl-sw --"
                              + COMPILE_MODE + " --qmldir " + get_project_dir() + "\\src\\res\\qml\\ " + get_deploy_dir() + "\\AdvancedSettings.exe")
-
+    add_error_handling_line_to_bat_file()
     add_line_to_run_bat_file("@ECHO windeployqt finished.")
 
     say("windeployqt added to file.")        
@@ -81,7 +81,7 @@ def deploy():
     copy_folder(get_project_dir() + "\\src\\package_files", get_deploy_dir())
     
     #openvr dll
-    copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "openvr_api.dll")
+    copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll")
 
     say("Creating batch file:")
     create_batch_file()
diff --git a/build_scripts/win/test.bat b/build_scripts/win/test.bat
index 9f346b7..612ad0d 100644
--- a/build_scripts/win/test.bat
+++ b/build_scripts/win/test.bat
@@ -1,4 +1,9 @@
-set PATH=%PATH%;C:\Qt\5.11.1\msvc2017_64\bin\;
-@ECHO Starting windeployqt:
-"windeployqt" --dir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\qtdata --libdir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings --plugindir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\qtdata\plugins --no-system-d3d-compiler --no-opengl-sw --release --qmldir Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\src\res\qml\ Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\AdvancedSettings.exe
-@ECHO windeployqt finished.
+@ECHO Starting 7zip:
+"C:\Program Files\7-Zip\7z.exe" a -t7z Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\\bin\\win64\\AdvancedSettings\AdvancedSettings-2-8-0.7z Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\\bin\\win64\\AdvancedSettings\*
+IF ERRORLEVEL 1 EXIT /B 1
+@ECHO 7zip done.
+@ECHO Starting NSIS:
+cd Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\NSISPortable\App\NSIS
+makensis /V2 /WX Z:\Programming\Cpp\2018-09-12_OpenVR_AdvancedSettings\OpenVR-AdvancedSettings\installer\installer.nsi
+IF ERRORLEVEL 1 EXIT /B 1
+@ECHO NSIS done.
diff --git a/build_windows.cmd b/build_windows.cmd
index ca24e22..624b04f 100644
--- a/build_windows.cmd
+++ b/build_windows.cmd
@@ -22,14 +22,13 @@ SET project_dir=%folder_path%
 
 
 ECHO %top_level_activity%: Calling build script.
-CALL %project_dir%\build_scripts\win\build.cmd
-%PYTHON%\python %project_dir%\build_scripts\win\build.py build
+%PYTHON%python %project_dir%\build_scripts\win\build.py build
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
 call %project_dir%\build_scripts\win\test.bat
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
 
 ECHO %top_level_activity%: Calling deployment script.
-%PYTHON%\python %project_dir%\build_scripts\win\build.py deploy
+%PYTHON%python %project_dir%\build_scripts\win\build.py deploy
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
 call %project_dir%\build_scripts\win\test.bat
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
@@ -41,7 +40,7 @@ IF NOT DEFINED BUILD_PACKAGE (
     EXIT /B %exit_code_success%
 )
 ECHO %top_level_activity%: Calling packaging script.
-%PYTHON%\python %project_dir%\build_scripts\win\build.py package
+%PYTHON%python %project_dir%\build_scripts\win\build.py package
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%
 call %project_dir%\build_scripts\win\test.bat
 IF ERRORLEVEL 1 EXIT /B %exit_code_failure_build_apps%