Last commit before trying CoreData