Making progress on Windows Compatibility