WIP: Updates for windows