Add watcher.

It would be good to not exceed the limit of 80 characteres