wip - services refactoring