Attempting to rework the timeout system.