remove the broken delays, restore the message and add a TODO
FINALLY! It lives!!