start a watch branch for tag testing
fix lookup code for the watch file
Merge branch 'watch'