Making a start to backport MarketPlace and ShowCase into the viewer