Starting to test the watcher. Need to extract more classes