Start moving over mcapi calls. Cleanup the data model.