Revert "Revert "Shop and camp changes""

This reverts commit a566d29cfd8213cf62bc21926a45d9e81d91d7fa.
Revert "Revert "hurry""

This reverts commit 50bdd3cd241d5f7521f808f89171222f119cf9fb.