E0d/xqw test

Adds watcher-wide config file
Removes some duplicated code.