Got Windows Desktop implementation to near feature parity with OS X implementation