BAP-6590: Base Client Side Architecture

before the next action (or before the first action if it is in....)