Deposit upgraded to UUIDs, shop still under construction

I have now upgraded the Deposit to UUIDs. It’s not as complicated, but the Shop is a different animal, so it’s still under construction. I want to make sure that I don’t have a mistake somewhere that makes someone lose they marbles blocks.