Work on the PopUser refactor