Adding user model
WIP: Getting query params from user
Merge branch 'staging'