Put the Battery Before the Electric Vehicle