Work on refactoring PopUser