More integration of Core Data - all original functionality plus persistence works