Random work to add Windows support

Need to check if this is mergable.