Got WIndows Desktop implementation to near feature parity with OS X implementation.