Close to getting things all working on windows.