CoreData properly implemented now