Added TODO notes