-#include <LiquidCrystal.h>
-
-LiquidCrystal lcd(12,11,5,4,3,2);
-
-// End display setup
-
 #define P1PIN           8
 #define P2PIN           9
 #define SPEAKERPIN      6
 #define LONGPRESS_TIME 25
+#define LATCH 4
+#define CLK   3
+#define DATA  2
+
+// Seven Segment Display Handling
+byte DigitBytes[10]= {0x3F, 0x06, 0x5B, 0x4F, 0x66, 0x6D, 0x7D, 0x07, 0x7F, 0x67};
 
 // Button handling
 enum { BUTTON_NONE=0, BUTTON_SHORT, BUTTON_LONG};

int p2Score = 0;
int currentServe = 0; // p1 = 0, p2 = 1
int numServes = 0;

int gameOver = 0;



void setup()
{
  pinMode(LATCH, OUTPUT);
  pinMode(CLK, OUTPUT);
  pinMode(DATA, OUTPUT);

  showScore();
  
  p1Button.init();
