Adding several TODO