Add proper support for Windows, attempt 1