diff --git a/gameplay/tile.java b/gameplay/tile.java
@@ -1,52 +1,48 @@
 import javax.swing.*;
+import java.util.ArrayList;
 
 /**
  *
  * Created by Alex on 5/23/2015.
  *
  */
 public class tile {
-    cup[] whatCups;
-    int currentCupSize = 1;
+    ArrayList<cup> whatCups;
+    int currentCupSize = 0;
+    int locationInArray = 0;
 
     public tile() {
-        whatCups = new cup[4];
+        whatCups = new ArrayList<>();
     }
 
     public tile(int maxCupSize){
         currentCupSize = maxCupSize;
-        whatCups = new cup[4];
+        whatCups = new ArrayList<>();
     }
 
-    public tile(cup[] cupArray){
-        this.whatCups = cupArray;
+    public tile(ArrayList<cup> cupArray){
+        whatCups = cupArray;
         currentCupSize = getBiggestCupSize();
     }
 
-    public cup[] getWhatCups() {
+    public ArrayList<cup> getWhatCups() {
         return whatCups;
     }
 
-    public void addCup(cup a) {
-        whatCups[currentCupSize-1] = a;
-        currentCupSize += 1;
-    }
-
-    public void removeCup(cup a) {
-        whatCups[currentCupSize-1] = null;
-        currentCupSize -=1;
-    }
-
     public JLabel getBiggestCup() {
-        System.out.println(whatCups[0]);
-        System.out.println(currentCupSize);
-        if (! (whatCups[currentCupSize - 1] == null)) {
-            if (whatCups[currentCupSize- 1].getColor()) {
-                ImageIcon icon = new ImageIcon(System.getProperty("user.dir") + "\\BlackGobbletSize" + currentCupSize + ".jpg");
-                JLabel lab = new JLabel(icon);
-                return lab;
-            } else  { //if (!(whatCups[currentCupSize - 1].getColor()))
-                ImageIcon icon = new ImageIcon(System.getProperty("user.dir") + "\\BeigeGobbletSize" + currentCupSize + ".jpg");
+        if (whatCups.size() > 0 ) {
+            if (!(whatCups.get(locationInArray) == null)) {
+                if (whatCups.get(locationInArray).getColor()) {
+                    ImageIcon icon = new ImageIcon(System.getProperty("user.dir") + "\\BlackGobbletSize" + getBiggestCupSize() + ".jpg");
+                    JLabel lab = new JLabel(icon);
+                    return lab;
+                } else { //if (!(whatCups[currentCupSize - 1].getColor()))
+                    ImageIcon icon = new ImageIcon(System.getProperty("user.dir") + "\\BeigeGobbletSize" + getBiggestCupSize() + ".jpg");
+                    JLabel lab = new JLabel(icon);
+                    return lab;
+                }
+            } else {
+                ImageIcon icon = new ImageIcon(System.getProperty("user.dir") + "\\BlankTile.jpg");
                 JLabel lab = new JLabel(icon);
                 return lab;
             }
@@ -55,14 +51,15 @@ public JLabel getBiggestCup() {
             JLabel lab = new JLabel(icon);
             return lab;
         }
-       // return new JLabel(new ImageIcon(System.getProperty("user.dir") + "\\BlankTile.jpg"));
     }
 
     private int getBiggestCupSize(){
         int largest = 0;
-        for(int s= 0; s < whatCups.length; s++){
-            if(whatCups[s].getSize() > largest){
-                largest = whatCups[s].getSize();
+        for(int s = 0; s < whatCups.size(); s++) {
+            if (!(whatCups.get(s) == null)) {
+                if (whatCups.get(s).getSize() > largest) {
+                    largest = whatCups.get(s).getSize();
+                }
             }
         }
         return largest;