Refactor out parent Watcher