Watcher support added (w/ debug)

Will provide follow up commit w/o debug shortly