Add TODO comments