Wiring up last of refactor
CORE-5300