Switch to live vehicles almost done