everything builds on mac... now going to add fixup