and the watcher is finally working. no tests yet, but it works