changed back to a pass along model than a db model. db code still there