Removed Hard-coding of deleted directory. Added TODO list.