Added file watcher (needs crash fix)