Continue working on the PopUser refactor