Adjusted the findServices method a bit... still needs some tweaking