WIP refactoring response parser