Added wait

Will document later