Beginning to add CoreData support, not finished hooking it up yet