[WIP] Clients must wait for completion of actions

Perhaps in its own package, or util? Doesn't seem limited to clients type activity.