Added untested battery-watcher