Sounds complicated. Musk has said that Lithium batteries are improving at a rapid enough pace that they expect impressive increases in capacity and duty cycles by the third iteration of the Model 3.