Re did Core Data model. Over all I think it is an improvement.