Begin refactoring out service calls.