Windows build support work in progress