WIP on watcher logic