Beginning of CoreData refactoring (7/14)