Add non-user flow
Merged JV changes, finished non-user flow, moved shop