First swing at implementing timeouts