Add a watcher and (awful) tests for it