As intriguing as a battery swap option sounds, I don't believe that is in the cards for the Model S. A few weeks ago I was on the phone with a charging problem and happened to ask for worst case scenario. The technician said that worst case is a battery swap, which in itself would not take that long, but would require that the car remain with them for two days (essentially leaving it overnight) for comprehensive testing. This car is a not a cellphone and it wasn't designed as a battery swap vehicle. For that system, one needs to check out the model being built in China via Kandi Technologies.