diff --git a/Minesweeper.pde b/Minesweeper.pde
index d18c6d73..5caea979 100644
--- a/Minesweeper.pde
+++ b/Minesweeper.pde
@@ -1,108 +1,183 @@
 import de.bezier.guido.*;
 //Declare and initialize constants NUM_ROWS and NUM_COLS = 20
+private int NUM_ROWS = 7;
+private int NUM_COLS = 7;
 private MSButton[][] buttons; //2d array of minesweeper buttons
-private ArrayList <MSButton> mines; //ArrayList of just the minesweeper buttons that are mined
+private ArrayList <MSButton> mines = new ArrayList <MSButton> (); //ArrayList of just the minesweeper buttons that are mined
 
 void setup ()
 {
-    size(400, 400);
-    textAlign(CENTER,CENTER);
-    
-    // make the manager
-    Interactive.make( this );
-    
-    //your code to initialize buttons goes here
-    
-    
-    
-    setMines();
+  size(400, 400);
+  textAlign(CENTER, CENTER);
+
+  // make the manager
+  Interactive.make( this );
+
+  //your code to initialize buttons goes here
+  buttons = new MSButton[NUM_ROWS][NUM_COLS];
+  for (int r = 0; r < NUM_ROWS; r++)
+    for (int c = 0; c < NUM_COLS; c++)
+      buttons[r][c] = new MSButton(r, c);
+  setMines();
 }
+
 public void setMines()
 {
-    //your code
+  //your code    
+  while (mines.size() < 1) {
+    int rRow = (int)(Math.random() * NUM_ROWS);
+    int rCol = (int)(Math.random() * NUM_COLS);
+    if (!mines.contains(buttons[rRow][rCol])) {
+      mines.add(buttons[rRow][rCol]);
+    }
+  }
 }
 
 public void draw ()
 {
-    background( 0 );
-    if(isWon() == true)
-        displayWinningMessage();
+  background( 0 );
+  if (isWon() == true)
+    displayWinningMessage();
 }
+
 public boolean isWon()
 {
-    //your code here
-    return false;
+  //your code here
+  return false;
 }
+
 public void displayLosingMessage()
 {
-    //your code here
+  //your code here
+  for (int r = 0; r < NUM_ROWS; r++)
+    for (int c = 0; c < NUM_COLS; c++)
+      if (mines.contains(buttons[r][c])) {
+        buttons[r][c].setLabel("B");
+    }
 }
+
 public void displayWinningMessage()
 {
-    //your code here
+  //your code here
+  println("Winner");
 }
+
 public boolean isValid(int r, int c)
 {
-    //your code here
-    return false;
+  //your code here
+  if (r >= 0 && r < NUM_ROWS && c >= 0 && c < NUM_COLS)
+    return true;
+  return false;
 }
+
 public int countMines(int row, int col)
 {
-    int numMines = 0;
-    //your code here
-    return numMines;
+  int numMines = 0;
+  //your code here
+  for (int r = row - 1; r <= row + 1; r++)
+    for (int c = col - 1; c <= col + 1; c++)
+      if (isValid(r, c) == true && mines.contains(buttons[r][c]))
+        numMines++;
+  return numMines;
 }
+
 public class MSButton
 {
-    private int myRow, myCol;
-    private float x,y, width, height;
-    private boolean clicked, flagged;
-    private String myLabel;
+  private int myRow, myCol;
+  private float x, y, width, height;
+  private boolean clicked, flagged;
+  private String myLabel;
+
+  public MSButton ( int row, int col )
+  {
+    width = 400/NUM_COLS;
+    height = 400/NUM_ROWS;
+    myRow = row;
+    myCol = col; 
+    x = myCol*width;
+    y = myRow*height;
+    myLabel = "";
+    flagged = clicked = false;
+    Interactive.add( this ); // register it with the manager
+  }
+
+  // called by manager
+  public void mousePressed () 
+  {
+    clicked = true;
+    //your code here
+
+    if (mouseButton == RIGHT) {
+      if (flagged == false) {
+        flagged = true;
+      } else {
+        flagged = false;
+        clicked = false;
+      }
+    } else if (flagged == false && mines.contains(this) && mousePressed) {
+      displayLosingMessage();
+    } else if (!mines.contains(this)) {
+      setLabel(countMines(myRow, myCol));
+    } 
     
-    public MSButton ( int row, int col )
-    {
-        // width = 400/NUM_COLS;
-        // height = 400/NUM_ROWS;
-        myRow = row;
-        myCol = col; 
-        x = myCol*width;
-        y = myRow*height;
-        myLabel = "";
-        flagged = clicked = false;
-        Interactive.add( this ); // register it with the manager
-    }
 
-    // called by manager
-    public void mousePressed () 
-    {
-        clicked = true;
-        //your code here
-    }
-    public void draw () 
-    {    
-        if (flagged)
-            fill(0);
-        // else if( clicked && mines.contains(this) ) 
-        //     fill(255,0,0);
-        else if(clicked)
-            fill( 200 );
-        else 
-            fill( 100 );
-
-        rect(x, y, width, height);
-        fill(0);
-        text(myLabel,x+width/2,y+height/2);
-    }
-    public void setLabel(String newLabel)
-    {
-        myLabel = newLabel;
-    }
-    public void setLabel(int newLabel)
-    {
-        myLabel = ""+ newLabel;
-    }
-    public boolean isFlagged()
-    {
-        return flagged;
+
+
+
+    else {
+      if(isValid(myRow, myCol-1) && buttons[myRow][myCol-1].isClicked() == false){
+       //for (int r = myRow - 1; r <= myRow + 1; r++)
+       // for (int c = myCol - 1; c <= myCol + 1; c++)
+          buttons[myRow][myCol-1].mousePressed();
+      }
     }
+
+
+
+
+
+  }
+
+  public void draw () 
+  {    
+    if (flagged)
+      fill(0);
+    else if (clicked && mines.contains(this) ) 
+      fill(255, 0, 0);
+    else if (clicked)
+      fill( 200 );
+    else 
+    fill( 100 );
+    rect(x, y, width, height);
+    fill(0);
+    text(myLabel, x+width/2, y+height/2);
+  }
+  public void setLabel(String newLabel)
+  {
+    myLabel = newLabel;
+  }
+  public void setLabel(int newLabel)
+  {
+    myLabel = ""+ newLabel;
+  }
+  public boolean isFlagged()
+  {
+    return flagged;
+  }
+  public boolean isClicked()
+  {
+    return clicked;
+  }
 }
+
+
+
+//Maybe Future Use
+//String message = new String("You Lose");
+//  for (int i = 0; i < message.length(); i++){
+//    buttons[i][i+5].clicked = true;
+//      if(!mines.contains(buttons[i][i+5]))
+//        mines.add(buttons[i][i+5]);
+//          buttons[i][i+5].setLabel(message.substring(i,i+1));
+//  }
+// println("loser");