Feature/soledad adbapi3

DO NOT MERGE YET
just for testing / pullreq purposes

Absolutely.
I think we need to look into the direction of cancellable deferreds for this. Yet another TODO to add, that maybe we can stub with a failing test to remind us...