Start of modeling users
Merge branch 'modeling-users'
small edit