Begin addressing service refactoring