PRD-3965 Second phase refactor to current specs… work in progress