Windows version working with shared code

Convert Windows version over to shared code