Changed how shops are implemented - Fixes #234