include headers in response.

- also structure things better...?...