Pull method up refactoring
Fix watcher permissions