more work on new file watcher