Updated TODO per recent work.