I would love to believe that mainstream car manufacturers have caught up but I don't. As you mention yourself, the product cycle for cars is easily 3 years and the EVs that most mainstream car manufacturers have announced here in 2016 that they will market in 2018-2020 are less ambitious compared to the models Tesla markets already now. So give it another 3 years from 2018 and I would expect GM, VW, Mercedes, Toyota et all to have compatible EVs in 2021-2023.