Car batteries mk ii

Updated PR again to base it on new vehicle component system.  Obsoletes #3288