WIP: W32 better