don't include xcode stuff
new tests
weird merge
fix up the xcode