Work in progress on bringing Windows build back online, need to rebase to master before hacking up the CMake too much