Beginning initial work for windows support