Battery swapping has been controversial in the plug-in electric vehicle industry, and does have a cadre of supporters including Better Place and Renault-Nissan. The long-anticipated second electric car from Tesla is moving along in the design stage and will come with a swappable battery, as Tesla tests out the water.