Updated TODO to reflect last changes.