 int safetyThen;
 boolean wasHigh = false;
 
+
+
 ///SETUP//////////////////////////////////////////////////////////////////
 void setup(void)
 {
-
+  //Since this controls the relay, best to set it low first
   pinMode(BLENDER_PIN, OUTPUT);
+  digitalWrite(BLENDER_PIN, LOW);
+  
+  //All the inputs
   pinMode(SENSOR_1_PIN, INPUT);  
   pinMode(SENSOR_2_PIN, INPUT);  
   pinMode(BUTTON_PIN, INPUT);
-  pinMode(GREEN_LED_PIN, OUTPUT);
+
+  //Set all the LEDs as outputs, and let low to start
   pinMode(RED_LED_PIN, OUTPUT);
-  
-  pinMode(SWITCH_1_PIN, INPUT);
-  pinMode(SWITCH_2_PIN, INPUT);
-  pinMode(SWITCH_3_PIN, INPUT);
-  pinMode(SWITCH_4_PIN, INPUT);
-
-  digitalWrite(BLENDER_PIN, LOW);
-  digitalWrite(GREEN_LED_PIN, LOW);
-  digitalWrite(RED_LED_PIN, LOW);
-
+  digitalWrite(RED_LED_PIN, LOW);  
+  
+  pinMode(GRN_LED_PIN, OUTPUT);
+  digitalWrite(GRN_LED_PIN, LOW);  
+  
+  pinMode(YLW_LED_PIN, OUTPUT);
+  digitalWrite(YLW_LED_PIN, LOW);  
+  
+  pinMode(BLU_LED_PIN, OUTPUT);
+  digitalWrite(BLU_LED_PIN, LOW);  
+  
+  pinMode(DECODER_LINE0,OUTPUT);
+  pinMode(DECODER_LINE1,OUTPUT);
+  pinMode(DECODER_LINE2,OUTPUT);
+  
+  pinMode(DECODER_ENABLE, OUTPUT);
+  digitalWrite(DECODER_ENABLE, LOW);
+  
   Serial.begin(9600);
-  Serial.println("Starting CounterCat2...");
+  Serial.println("Starting CounterCat3...");
   if (USE_PIR2)
   {
     Serial.println("Using PIR2 as safety.");

    {
      if (wasHigh)
      {
        digitalWrite(RED_LED_PIN, LOW);
        wasHigh = false;
      } 
      else
      {
        digitalWrite(RED_LED_PIN, HIGH); 
        wasHigh = true;
      }
    }

    if (now > (timerStart + WARM_UP_TIME_MS))
    {
      Serial.println("Warmed up!");
      currentState = S_ARMED;
      digitalWrite(WARMUP_LED_PIN,LOW); //make sure this pin goes off
    }
    break;


  case 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)
