Move wait procedure into agenda module.