Start of making this work on Windows