[WIP] Clients must wait for completion of actions

nit: a bit much for a single line...