Added some todo notes to improve watch task.