Same question as below (sorry, I'm reading from the bottom). In a lot of classes, we now have two battery objects, we should try to reduce to one.