Working on getting windows compiling again