Refactor watcher
Update TODO