Almost done spiking out timeouts