Work on PopUser refactor