Started adding user stuff from chapter 4.