Adding some changes to shop, still WIP