Adding TODO's for index and methods