Finished UI cleanup of JSON to callbacks, and converting API to generic object functions