Some work on getting the file watcher up & running again