[WIP] Clients must wait for completion of actions

Agree