Changed shopMap to shopSet and updated relevant stuff.