Changed interface to support delegates, progressing with directory watcher