Wip/battery again

This is a naive attempt to add battery status from jason, j2moore et all into the refactoring...
It compiles and runs, but probably doesn't quite work as expected.

@m2oore, @jasoncalabrese wonder what you guys think of something like this?