     break;
 
   case S_COOLDOWN:
-
-    turnOffAllLEDs();
     
-    if (now % COOLDOWN_FLICKER == 0)
-    {
-      if (wasHigh)
-      {
-        digitalWrite(COOLDOWN_LED_PIN, LOW);
-        wasHigh = false;
-      }
-      else
-      {
-        digitalWrite(COOLDOWN_LED_PIN, HIGH);
-        wasHigh = true; 
-      }
-
-    }   
-
-    if (now > (timerStart + COOLDOWN_TIME_MS))
+    
+    digitalWrite(COOLDOWN_LED_PIN, HIGH);
+    
+    if (now > (timerStart + COOLDOWN_TIME))
     {
       Serial.println("Done cooling down.");
       currentState = S_ARMED;  

    //Leave the red light on while we're armed
    turnOffAllLEDs();
    digitalWrite(ARMED_LED_PIN, HIGH);

    //If there's a rising edge on the sensor pin
    if (sensorRising)
    {

  {

  case S_WARMING_UP:
    if (now % WARM_UP_PRINT_RATE == 0)
    {
      Serial.println(String(now*100/WARM_UP_TIME, DEC) + "%");  
    }

    if (now % WARM_UP_FLICKER == 0)
