Updated TODO after today's effort.