rolled back to master version

Will try to implement Core Data again
Rolled back to previous master version