Work on refactor of the PopUser module