Add wait option for cabby and subsequent page

Please review this, @casey-collab