Added Shops, Didn't test yet