clean up a few things
simplify context interactions
Add support for multipart requests