Beginning to enable Windows support