Rewrite the way shops are handled, we're still hitting a few quirks!