Feature/soledad adbapi3

DO NOT MERGE YET
just for testing / pullreq purposes

It seems to me that we are never ready given current code, are we?