Thread Watcher rewrite, close #99