Add TODO comments where required