#update - rephase cloudkit code