starting to refactor services into functional testable pieces [#58082350]