Lots Of Changes

Went back to using the Objective C API, coulnd't format right