finish dealing with todos in Chapter 3