Lots of work creating a better way to handle responses.