Major rearrangement, power miser-ing when dead battery is charging.