More work on the Battery.Not done yet!