yet another recovery attempt
finishing chapter 6, up to ch 7
Merge branch 'users'