Win32 re-port of dongle refactor done