Beginning to add windows support