Updated TODO to match reality, and needs