Slight refactor of the resolver so all actions massage the repository