Feature/soledad adbapi3

DO NOT MERGE YET
just for testing / pullreq purposes