Ugly but functional data collection and collapsing
Slight refactoring to clean up code
Merge pull request #7 from Naosyth/bw-add-battery-data-collapsing

Bw add battery data collapsing