Modeling users

Chapter 6 changes