Partial request/response support
* Needs to be refactored