Quick port of battery status to refactored code, still needs some basic clean and fixed memory leak introduced by battery code.