Changes to include Windows into the codebase