Got rid of C++ and added Objective-C classes