Changes to run on Windows

Local testing is now much more feasible.