Adding TODO comments