Part 1 of transfering the new watchers to Server side.
Merge branch 'master' of https://github.com/siriusastrebe/syc