[sd] step one of the /watch refactor.