cleaning up
chapter 5 final push
user model and tests