support for the new status 'waiting'

Separate commit for this please