More work on windows