Begin condensing all CloudKit logic to data model