Merge "Refactoring to make adding a secondary easier"