Cleaning up initial commit and getting it to run on Windows