Macro out some more. Builds on windows