Work on the PopStore module