Updated TODO (again)