@vsoch, can we get rid of these variables in the battery view? They are holdovers from the original deployment idea, right?  @rwblair
