 #include <Adafruit_RGBLCDShield.h>// LCD + Button shield protocol
 
 // --------------PARAMETERS---------------------
-byte addrs[1][8] = {{16,206,166,130,2,8,0,63}}; // ,{16,24,64,68,0,8,0,112}
+byte addrs[1][8] = {{16,206,166,130,2,8,0,63}};
                                   // {16,24,64,68,0,8,0,112} Temp Sensor 1
-                                  // {16,206,166,130,2,8,0,63} Temp Sensor 2
+                                  // {16,206,166,130,2,8,0,63} Temp Sensor 2 unused at this time
 int busPin = 4;                   // Data bus for One Wire Comms
 int numOfDevices = 1;             // How many sensors are in loop
-int high = 80;                    // This is the default high temp setting
-int low = 70;                     // This is the default low temp setting
+int heat = 70;                    // This is the default heater trigger temp setting
+int cool = 80;                     // This is the default cooling trigger temp setting
 long currentTemp = 0.0;           // Current room temperature
 int serialSpeed = 9600;           // Default serial comm speed
 int tempSetpoint = 75;            // Default temperature setpoint on a reboot

  
  // Go through devices and read the temperatures
  for(int x = 0; x < numOfDevices; x++){
    // ------------FOLLOWING LINES FOR TESTING ONLY
    //Serial.print("Sensor ");
    //Serial.print(x);
    //Serial.print(" reports: ");
    //Serial.println(sensors.getTempF(addrs[x]));
    temp = sensors.getTempF(addrs[x]);
    if(temp != currentTemp){
      currentTemp = temp;

  
  uint8_t buttons = lcd.readButtons();  // Constantly check to see if something has been put on the bus
  
  // --------------Handle updating Temp Change Display---------------------
  if (getTemp()) {                      // Constantly check to see if the temperature has changed, and update appropriately
    lcd.clear();
    lcd.print("Current Temp: ");
