Refactor to remove reporter and map to responses instead
Fix all but 1 merge errors