refactor + service test ongoing