   else if (mnu == 1) {
     display.clearDisplay();
     pong();
-  }  
-}
-
-void menu() {
-  boolean b = true;
-  display.setTextSize(1);
-  int m = 0;
-  while (b) {
+  } else if (mnu == 2) {
     display.clearDisplay();
-    display.setCursor(0, 0);
-    display.println("Time\nPong");
-    if (pressedOnce(0))
-      m = abs(m-1) % 2;
-    else if (pressedOnce(2))
-      m = abs(m+1) % 2;
-    else if (pressedOnce(1))
-      Serial.println(m);
-    
-    
-    if (m == 0) {
-      display.setCursor(30, 0);
-    }
-    else {
-      display.setCursor(30, 10);
-    }
-    display.println("*");
-    display.display();
+    stopwatch();
   }
 }
 
 
-void updateButtonStates() {
-  for (int i = 0; i < 3; ++i) {
-    int reading = digitalRead(bpins[i]);
-    if (reading != lastButtonStates[i]) {
-      lastDebounceTimes[i] = millis();
-    }
-    if ((millis() - lastDebounceTimes[i]) > debounceDelay) {
-      if (reading == LOW) {
-       buttons[i] = 1;
-      } else {
-       buttons[i] = 0;
-      } 
-    }
-    lastButtonStates[i] = reading;
-  }
-}
-
-boolean pressedOnce(int b) {
-  updateButtonStates();
-  boolean r;
-  if (buttons[b] != lastReadings[b] && buttons[b])
-    r = true;
-  else
-    r = false;
-  lastReadings[b] = buttons[b];
-  return r;
-}

/*********************************************************************
 * This is an example for our Monochrome OLEDs based on SSD1306 drivers
 * 
 * Pick one up today in the adafruit shop!
 * ------> http://www.adafruit.com/category/63_98
 * 
 * This example is for a 128x64 size display using I2C to communicate
 * 3 pins are required to interface (2 I2C and one reset)
 * 
 * Adafruit invests time and resources providing this open source code, 
 * please support Adafruit and open-source hardware by purchasing 
 * products from Adafruit!
 * 
 * Written by Limor Fried/Ladyada  for Adafruit Industries.  
 * BSD license, check license.txt for more information
 * All text above, and the splash screen must be included in any redistribution
 *********************************************************************/


void loop() {
  if (pressedOnce(1)) {
    mnu = (mnu + 1) % 3;
  }
  if (mnu == 0) {
    if (pressedOnce(0)) {
