Split client and initiator. Added queuing logic.