Added stuff to the TODO in section 6.2