Organize the watcher API's a bit
Replace the watcher with something new