Added TODO list for remaining tasks