Started working on the resource watcher