Add TODO, and chapter 5 work