Updated TODO as the way I am starting the index is fine!