First stab at a 'smart watcher' for issue #71. Needs testing.