Adding watcher base. Clarifying some external references.