Finishing up work on directory watcher