Started work on Windows version