Elon has already stated many times it's coming as a choice but right now the only sane reason for a battery swap is if the battery fails which is covered by warranty.