Added TODO tasks