partial update to Win32 build, not working yet