Watcher logic complete