Adding TODO notes