can we put the watcher in its own file?