Windows Build

I have made changes to the source for making the code build on Windows, without warnings or errors of any kind.  Please merge this with the main branch.