Feature/soledad adbapi3

DO NOT MERGE YET
just for testing / pullreq purposes

Cool. Do you mind updating it in your branch as your tests pass around it?