After a controversial merger between Elon Musk’s companies, Tesla and SolarCity, was announced back in June, SolarCity is in the news again as it announced a venture into the roofing industry.

During SolarCity’s second quarter earnings conference, its CEO, Lyndon Rive, announced the company will be revealing two new products by the end of this year. Elon Musk revealed other details, saying that one of those will be a solar roof.

Musk further clarified that this will not be a module installed on a roof, it will be the roof. Rive confirmed these details of a roofing integrated product. Both said this move is aimed at the new roof market, which has at least five million installations every year in the U.S.

Like a Tesla car, this roofing product can be customized, and is then sent to the customer as a kit so that it can be installed.

This new venture into roofing is completely in line with Tesla’s “Master Plan Part Deux”, which specifically indicates creating a “solar-roof-with-battery product that just works.”