Updated TODO (added a new task that came in mind just now)