Update TODO, add delayed messages to the list of things I want.