Tesla recently revealed its “Master Plan, Part Deux” not too long ago, which highlighted several goals the company hopes to accomplish in the future. One of those plans includes expanding its electric vehicle product line to “address all major segments.” It appears that a minibus (van) and a “Model Y” are among the planned vehicles, according to company CEO, Elon Musk.

Musk acknowledged a Jalopnik article on Twitter, which said the Model X should have actually been a van as it made more sense. The Tesla boss couldn’t agree more, saying “some good guessing by Jalopnik. The Tesla Minibus will be built on a Model X chassis. People density potential is surprisingly high.”

Such a vehicle will take on the production version of Volkswagen’s Budd-e concept, which was revealed at this year’s Consumer Electronics Show (CES), and is influenced by the iconic Type 2 (or Transporter, Kombi, Microbus, Bus and Camper) van. Musk has stated in an even earlier Twitter posting that Tesla’s electric minibus is “inspired by some of the California Custom VW combi design art.”

As for the Model Y, such a model was hinted in the second part of the company’s “Master Plan,” where it was referred to as a “future compact SUV” at the time. The Model Y nameplate was later confirmed by Musk, in a reply to Road & Track on Twitter, and will be based on the Model 3 platform.

Another model stated in Tesla’s “Master Plan” is a new kind of pickup truck, while other components of the plan include the creation of solar roofs featuring a seamlessly integrated battery storage, developing a self-driving capability that is ten times safer than manual via massive fleet learning and enabling car to make money for owners when they aren’t using it.