Home stretch, fixing up battery class