Continued work on windows