 // We need to be able to stop the fading
 void unset(int lamp) {
   cycleFade[lamp] = 0;
+  waterFade[lamp] = 0;
   lamps[lamp].fadeStop();
 }
 

        lamps[lamp].fade(cycleFade[lamp], colors[random(0, 215)]);
      }
    }
    else if(water[lamp] != 0) {
      if(millis() > water[lamp]) {
        waterCur[lamp] = (waterCur[lamp] + 1) % 748;
        lamps[lamp].setColor(waterCols[waterCur[lamp]]);
        water[lamp] += 100;
      }
    }
  }

int dayCols[20][3];
int waterCols[748][3];
float cycleFade[4] = {0,0,0,0};
unsigned long waterFade[4] = {0,0,0,0};
unsigned short waterCur[4] = {0,200,400,600};

void setup() {

