Sp resolver 2

Use a service class rather than a callback.