WIP: Add wait exchange