added Watcher/notifier (still in early days)