Moved TODO stuff to section locations.