I don't like the idea of hard-coded timeouts. Perhaps we should increase the default?