 //---------------------------------------------------------------
 //BUTTON STUFF
 // This uses JChristensen's Button Library from:
-//   https://github.com/JChristensen/Button
-#include "Button.h"    // Include Button library
-const int buttonPin = 4;  // Set digital pin used with debounced pushbutton
+//   https://github.com/JChristensen/JC_Button
+#include "JC_Button.h"    // Include Button library
+const uint8_t buttonPin = 4;  // Set digital pin used with debounced pushbutton
 Button myButton(buttonPin, true, true, 50);  // Declare the button
 
 
 //---------------------------------------------------------------
 void setup() {
   Serial.begin(115200);  // Allows serial monitor output (check baud rate)
-  delay(3000); // 3 second delay for recovery
+  delay(1500); // short delay for recovery
   //FastLED.addLeds<LED_TYPE,DATA_PIN,COLOR_ORDER>(leds, NUM_LEDS).setCorrection(TypicalLEDStrip);
   FastLED.addLeds<LED_TYPE,DATA_PIN,CLK_PIN,COLOR_ORDER>(leds, NUM_LEDS).setCorrection(TypicalLEDStrip);
   FastLED.setBrightness(BRIGHTNESS);
+  FastLED.clear();
+  
+  myButton.begin();  // initialize the button object
+
+  Serial.println("Setup done.\n");
 }
 
 
 // List of patterns to cycle through.  Each is defined as a separate function below.
 typedef void (*SimplePatternList[])();
-SimplePatternList gPatterns = { rainbow, confetti, sinelon, juggle };
+//SimplePatternList gPatterns = { applause, fillAndCC, blinkyblink1, blinkyblink2, spewFour, spew, confetti_GB, rainbow, confetti, sinelon, juggle };
+SimplePatternList gPatterns = { twoDots, fillAndCC, blinkyblink2, spewFour, spew, confetti_GB, rainbow, confetti, sinelon, juggle };
 
 uint8_t gCurrentPatternNumber = 0; // Index number of which pattern is current
 uint8_t gHue = 0; // rotating "base color" used by many of the patterns

  leds[pos] += CHSV( gHue, 255, 192);
}

void juggle() {
  // four colored dots, weaving in and out of sync with each other
  fadeToBlackBy( leds, NUM_LEDS, 20);

  // do some periodic updates
  EVERY_N_MILLISECONDS( 20 ) { gHue++; } // slowly cycle the "base color" through the rainbow

}//end_main_loop

#define ARRAY_SIZE(A) (sizeof(A) / sizeof((A)[0]))
