Add stuff from exercises in chapter 6