Continue refactoring plugin.  Added a callback for didFindService which is working