huge progress on transition to Core Data