Some fixes and additions for Watcher
Finished implementation, now debugging
First working multithreaded version