finished updating model to be an entity model