Continue working on PopUser refactor