Mostly finished

Needs final integration testing and debugging on Windows.
Replacing Windows executables