Further note

Actually I think timeout may be a large pain to test/implement, so we will likely both want to work on it. But in any case that's after next demo, so let's just push it off entirely.