Added watcher component and tests
Merge branch 'zcaudate-master'