Added the beginnings of a core data wrapper
Merge remote-tracking branch 'origin'