pretty much done - just have an issue with WebMock matchers
refactors based on PR comments