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