BAP-6590: Base Client Side Architecture

second one is closer, thanks