Added TODO flag to comments