Split off code into MasterRepresenter.
More renaming