Moved Service calls into a class which can be mocked out.