Still working on Core Data - working out the kinks