Merge latest Win32 code

Removed the previous placeholder code and uploaded my Win32 port code