temp commit
watcher works now
code clean
Finished feature watcher.