started adding support for Win32