Restructuring objects into layers a little more. Battery info now reliable and clean!