 uint8_t dataPin  = 2;    // Yellow wire on Adafruit Pixels
 uint8_t clockPin = 3;    // Green wire on Adafruit Pixels
 
-#define GRIDSIZE 5
+#define GRIDSIZE 5 // We have a 5x5 LED array
+
 
 unsigned long previousMillis = 0;
 unsigned long frameDelayMillis = 5; // time between frames
 
 // Set the first variable to the NUMBER of pixels.
-Adafruit_WS2801 strip = Adafruit_WS2801(25, dataPin, clockPin);
-LEDFader Fader(strip, 5, 5);
+Adafruit_WS2801 strip = Adafruit_WS2801(GRIDSIZE*GRIDSIZE, dataPin, clockPin);
+LEDFader Fader(strip, GRIDSIZE, GRIDSIZE);
 
 typedef void (*AnimationEndedCallback)();
 typedef void (*CurrentAnimationFP)(unsigned long);


        uint32_t c = ColorWheel(wheelPos);

//        // Fade in
//        if (rainbowStyle & RAINBOW_FADE_IN) {
//          double fadeInTime = 300;
//          if (transitionElapsed < fadeInTime) {
//            byte r = (c >> 16) & 0xff;
//            byte g = (c >> 8) & 0xff;
//            byte b = c & 0xff;
//            double factor = transitionElapsed / fadeInTime;
//
//            c = Color(r * factor, g * factor, b * factor);
//          }
//        }

        Fader.setPixelColor(x, y, c, 0.1);
        //strip.setPixelColor(y * GRIDSIZE + x, c);
      }
    }

    //strip.show();
  }
  else {
    transitionCompleteCallback();

//  { allOff, 0.5 },
  { pause, 0.5 },

  // Color swirls
  { rainbowAnimation, 10, 1 },
  { rainbowAnimation, 15, 0 },

