Updated TODO per recent developments.