Modified watcher to make passing channels simpler. Preparing for more debugging stuffs.