Even more changes

Too many to list
Merge pull request #4 from thebelin/1-add-shop

Even more changes