more refactoring related to preventing the start of multiple mastrs.