Gros gros MERGING commit WITH OLD METHODS CoreData