Windows support finally working