Changed everything to Objective-C