Working on getting windows recompiling and test running