WIP - Associate shop with user

Need to merge in index_test branch
Line is too long. [89/80]