Thats the most likely thing.
Im amazed how much attention the Battery swapping gets, although it doesn't fit anything that Elon mentioned in the past.
Guys thats a Tesla Forum, please stop suggesting boring non-innovative ideas, thats not what Tesla or Musk stands for.