Still working on Core Data.
Merge remote-tracking branch 'github/master'