WIP - Associate shop with user

Need to merge in index_test branch