deal with some todos in Chapter 4
work on some todos in Chapter 5