Re-port changes for Windows.  Do not merge yet, still a WIP