 #define VALV_CBR 6
 #define VALV_ATM 5
 #define PUMP	4
-#define BTN 3
-#define PRS_SEN 8
+#define BTN 2
+#define PRS_SEN 9
 
 // Different states of the machine: Idle, Vacuum, Dwell, and Drain
-enum states {IDLED, VACU, DWLL, DRIN};
-Adafruit_NeoPixel ledStat = Adafruit_NeoPixel(1, 2, NEO_GRB + NEO_KHZ800);
+enum states {IDLED=1, VACU=2, DWLL=3, DRIN=4};
+Adafruit_NeoPixel ledStat = Adafruit_NeoPixel(1, 3, NEO_GRB + NEO_KHZ800);
 unsigned long startTime;
 
 // Machine of various 'states' and updating method

	digitalWrite(VALV_CBR, HIGH);

    ledStat.setPixelColor(0, ledStat.Color(255, 0, 0));
}

void drain() {
	digitalWrite(VALV_PUMP, LOW);
	digitalWrite(VALV_CBR, LOW);
	digitalWrite(VALV_ATM, HIGH);

    ledStat.setPixelColor(0, ledStat.Color(0, 255,0));
}



    public:
    // Class Member Variables
	volatile int state;						// Current state of the machine
	unsigned long vacDwlTime;    					// Time limit for Vacuum and Dwell state combined
	int updateInterval; 					// Update interval for checking for changed button state
 
 	// Constructor for Machine class
  	
  	Machine(int startState, unsigned long setTime, int interval = 200)
  	{
		state = startState;
  	  	vacDwlTime = setTime;
