Adding few todos to the list

Change-Id: I90b6f46fc169aabc5b5ba3f464c7e40ccd851c21