Breaking some methods out for easier extension of response parsing. Addresses #355