Adding Core Data back in

The docs aren't quite done yet so I'll do those in another commit, but the main Core Data stuff is back in the app.