In preparation for having to only apply bug fixes to the code once, we first need to unify request construction. Joonas has reviewed almost all of the patches, and then added some more... -Chris