Added TODO notices