diff --git a/Build-Windows.md b/Build-Windows.md
index d9f58d4..617b38e 100644
--- a/Build-Windows.md
+++ b/Build-Windows.md
@@ -6,37 +6,70 @@ If you don't already have Visual Studio 2015 you can install the free Microsoft
 
 # Build wxWidgets
 
-- Download wxWidgets 3.0.2 from https://www.wxwidgets.org/downloads/ and unzip it to somewhere such as C:\MSVCDev\wxWidgets-3.0.2\
-- Navigate to C:\MSVCDev\wxWidgets-3.0.2\build\msw\ (or wherever you extracted) and open wx_vc12.sln
-- Choose "Release" and "x64" the build configuration and "Build Solution" 
-- All should be compiled now, you can close project.
+Download wxWidgets 3.0.2 from https://www.wxwidgets.org/downloads/ and unzip it to somewhere such as C:\MSVCDev\wxWidgets-3.0.2\
+
+Edit C:\MSVCDev\wxWidgets-3.0.2\src\tiff\libtiff\tif_config.h and comment out line 367:
+```
+    367: // #define snprintf _snprintf
+```
+
+Navigate to C:\MSVCDev\wxWidgets-3.0.2\build\msw\ (or wherever you extracted) and open wx_vc12.sln, Click "OK" to update the project on load.
+
+Choose "Release" and "x64" for the build configuration and "Build Solution".  All should compile successfully and you can close the project.
 	 
 
 # Install CMake:
     
 Download CMake from:
 
-    http://www.cmake.org/download/
+* http://www.cmake.org/download/
 
 For this guide I've used:
 
-    https://cmake.org/files/v3.4/cmake-3.4.0-rc3-win32-x86.exe
+* https://cmake.org/files/v3.4/cmake-3.4.0-rc3-win32-x86.exe
 
 Just install CMake with default or preferred options.
 
+# Install SoapySDR
 
-# Build CubicSDR: (incomplete, WIP)
+Download ZIP or clone SoapySDR from https://github.com/pothosware/SoapySDR to C:\MSVCDev\SoapySDR
 
-- Clone or download zip from https://github.com/cjcliffe/CubicSDR/ to a folder of your choice.  I'll use C:\MSVCDev\CubicSDR
-- Run CMake GUI
-- Choose C:\MSVCDev\CubicSDR for source.
-- Choose C:\MSVCDev\CubicSDR\cmake_build (or any output folder of your choice)
-- Click Configure.
-- Choose "Visual Studio 14 2015 Win64" and Finish.
-- Note that both DirectSound and WASAPI are supported but DirectSound is enabled by default.
-- Set wxWidgets_ROOT_DIR to "C:\MSVCDev\wxWidgets-3.0.2".
-- Configure again, all should be good, then Generate.
-- Navigate to your output folder (i.e. C:\MSVCDev\CubicSDR\cmake_build\) in explorer and open CubicSDR.sln.
-- Once open select "Release" and "x64" build configuration and then run "Build Solution" (F7)
-- CubicSDR.exe should now be in the output folder (i.e. C:\MSVCDev\CubicSDR\cmake_build\x64\) and ready to run.
+* Launch CMake, set source path to C:/MSVCDev/SoapySDR/
+* Set destination to C:/MSVCDev/SoapySDR_win64/
+* Click "Configure" and choose "Visual Studio 14 2015 Win64" and Finish
+* Click "Generate"
+
+Open "Developer Command Prompt for VS2015" by right-clicking and "Run as Administrator".
+
+From the prompt:
+
+```
+C:\> cd C:\MSVCDev\
+C:\MSVCDEV> cmake --build SoapySDR_win64 --config Release --target install
+... Bunch of building ...
+    0 Error(s)
+```
+
+Update your system environment variables (Search "enviornment variables" in windows 8/10 search) and append the following to the Path variable:
+
+```
+;C:\Program Files\SoapySDR\bin
+```
+
+
+# Build CubicSDR:
+
+* Clone or download ZIP from https://github.com/cjcliffe/CubicSDR/ to C:\MSVCDev\CubicSDR
+* Run CMake GUI
+* Choose C:\MSVCDev\CubicSDR for source.
+* Choose C:\MSVCDev\CubicSDR_win64 for build folder.
+* Click Configure.
+* Choose "Visual Studio 14 2015 Win64" and Finish.
+* Set wxWidgets_ROOT_DIR to "C:\MSVCDev\wxWidgets-3.0.2".
+* Configure again, all should be good, then Generate.
+* Navigate to C:\MSVCDev\CubicSDR_win64\ in explorer and open CubicSDR.sln.
+- Once open select "Release" and "x64" build configuration and then "Build Solution" (F6)
+- CubicSDR.exe should now be in the output folder (i.e. C:\MSVCDev\CubicSDR_win64\x64\) and ready to run (minus support modules).
+
+# Build Support Modules