ugh, macs, wtf __macosx
lite refactoring, undid method missing silliness