Moved a bunch of stuff into an xcode category.