Still doesn't all compile on osx
tossing local changes