[#52175923] add first pass of components