Service Refactor Progress