diff --git a/src/view/TileButton.java b/src/view/TileButton.java
index 3aafc82..413d2cc 100644
--- a/src/view/TileButton.java
+++ b/src/view/TileButton.java
@@ -11,13 +11,14 @@ public class TileButton extends JButton {
 
 	private static final long serialVersionUID = 1L;
 	private Tile tile;
+	private int tileNumber;
 
 	public TileButton(String name, int TileOnBoard, GameBoard board) {
 		super(name);
 
-		tile = board.getTile(TileOnBoard);
-		// this.setOpaque(false);
+
 		this.setContentAreaFilled(false);
+		setTileNumber(TileOnBoard);
 		// this.setBorderPainted(false);
 		this.setVisible(true);
 
@@ -28,5 +29,30 @@ public class TileButton extends JButton {
 	public void paint(Graphics g) { // Do nothing here }
 
 	}
+	
+
+
+
+	public Tile getTile() {
+		return tile;
+	}
+
+
+
+	public void setTile(Tile tile) {
+		this.tile = tile;
+	}
+
+
+
+	public int getTileNumber() {
+		return tileNumber;
+	}
+
+
+
+	public void setTileNumber(int tileNumber) {
+		this.tileNumber = tileNumber;
+	}
 
 }