Win32 support WIP 2