build out user
cleanup users name model consolidation