Improved Shop, etc.

-Backing up before making large changes