Added TODO plans