Added TODO Plan