Commit 7e9f903 already has win32 figured out. Will merge in fixes