Added a bunch of stuff (Shop related)