New shop mode
Merge pull request #114 from codergreen/master

codergreen's shop changes - part 1