diff --git a/src/card/Card.java b/src/card/Card.java
index 10cd0ee..f35f9bc 100644
--- a/src/card/Card.java
+++ b/src/card/Card.java
@@ -1,5 +1,6 @@
 package card;
-import game.AbstractGame;
+import game.BaseGame;
+import game.BaseGame.MSG_TYPES;
 
 import java.awt.Color;
 
@@ -16,23 +17,81 @@
 	protected int color;
 	protected int value;
 	protected int playerId;
-	protected AbstractGame g;
+	protected boolean isSelected;
+	protected BaseGame g;
 		
-	public Card(int color, int value, int playerId, AbstractGame g){
+	public Card(int color, int value, int playerId, BaseGame g){
 		this.color = color;
 		this.value = value;
 		this.playerId = playerId;
 		this.g = g;
+		isSelected = false;
 	}
 	
 	public Card clone(){
-		Card c = null;
-		try {
-			c = (Card) super.clone();
-		} catch (CloneNotSupportedException e) {
-			e.printStackTrace();
+		Card card = new Card(color, value, playerId, g);
+		return card;
+	}
+	
+	protected void onCardClick(){
+		if(isSelected){
+			g.removeSelectedCards();
+			isSelected = false;
+			if(g.getSelectedCards() == 0){
+				g.resetMoveValues();
+			}
 		}
-		return c;
+		if(!g.isUseColor() && !g.isUseValue() && !g.isTrashCard() && !g.isPlaceCard()){
+			g.printMessage("Please choose move type first", MSG_TYPES.ERROR);
+			return;
+		}
+		if(playerId == g.getCurrentPlayerIndex()){
+			if(g.isUseColor() || g.isUseValue()){
+				g.printMessage("Please don't select your own cards!", MSG_TYPES.ERROR);
+				return;
+			} else if((g.isTrashCard() || g.isPlaceCard()) && g.getSelectedCards() == 1){
+				g.printMessage("You already selected a card!", MSG_TYPES.ERROR);
+				return;
+			}
+		} else if(playerId != g.getCurrentPlayerIndex() && (g.isTrashCard() || g.isPlaceCard())){
+			g.printMessage("Please select your own cards", MSG_TYPES.ERROR);
+			return;
+		}
+		if(g.getSelectedPlayer() == -1){
+			g.setSelectedPlayer(playerId);
+			g.setChosenColor(color);
+			g.setChosenValue(value);
+			g.addSelectedCards();
+			isSelected = true;
+			return;
+		}
+		if(g.getSelectedPlayer() != playerId){
+			g.printMessage("Please choose a card of the selected player or unselect all cards and choose another player.", MSG_TYPES.ERROR);
+			return;
+		}
+		if(g.getChosenColor() == -1){
+			g.setChosenColor(color);
+		}
+		if(g.getChosenValue() == -1){
+			g.setChosenValue(value);
+		}
+		if(!isSelected){
+			if(g.isUseColor()){
+				if(g.getChosenColor() == color){
+					if(!isSelected){
+						g.addSelectedCards();
+						isSelected = true;
+					}
+				}
+			} else if(g.isUseValue()){
+				if(g.getChosenValue() == value){
+					if(!isSelected){
+						g.addSelectedCards();
+						isSelected = true;
+					}
+				}
+			}
+		}
 	}
 	
 	@Override
@@ -84,6 +143,14 @@
 		return color;
 	}
 	
+	public boolean isSelected(){
+		return isSelected;
+	}
+	
+	public void setSelected(boolean set){
+		isSelected = set;
+	}
+	
 	public int getColorInt(){
 		return color;
 	}
diff --git a/src/card/SwingCard.java b/src/card/SwingCard.java
index 1079316..379224b 100644
--- a/src/card/SwingCard.java
+++ b/src/card/SwingCard.java
@@ -1,7 +1,6 @@
 package card;
 
 import game.SwingGame;
-import game.AbstractGame.MSG_TYPES;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -33,67 +32,7 @@
 		face.addMouseListener(new MouseListener() {
 			@Override
 			public void mouseReleased(MouseEvent e) {
-				if(face.getBackground() == Color.pink){
-					g.removeSelectedCards();
-					face.setBackground(Color.black);
-					//System.out.println("Removed card #" + clickedCard + "(" + card.getColorInt() + ", " + card.getValue() + ")");
-					if(g.getSelectedCards() == 0){
-						g.resetMoveValues();
-					}
-				}
-				if(!g.isUseColor() && !g.isUseValue() && !g.isTrashCard() && !g.isPlaceCard()){
-					g.printMessage("Please choose move type first", MSG_TYPES.ERROR);
-					return;
-				}
-				if(playerId == g.getCurrentPlayerIndex()){
-					if(g.isUseColor() || g.isUseValue()){
-						g.printMessage("Please don't select your own cards!", MSG_TYPES.ERROR);
-						return;
-					} else if((g.isTrashCard() || g.isPlaceCard()) && g.getSelectedCards() == 1){
-						g.printMessage("You already selected a card!", MSG_TYPES.ERROR);
-						return;
-					}
-				} else if(playerId != g.getCurrentPlayerIndex() && (g.isTrashCard() || g.isPlaceCard())){
-					g.printMessage("Please select your own cards", MSG_TYPES.ERROR);
-					return;
-				}
-				if(g.getSelectedPlayer() == -1){
-					g.setSelectedPlayer(playerId);
-					g.setChosenColor(color);
-					g.setChosenValue(value);
-					g.addSelectedCards();
-					face.setBackground(Color.pink);
-					return;
-				}
-				if(g.getSelectedPlayer() != playerId){
-					g.printMessage("Please choose a card of the selected player or unselect all cards and choose another player.", MSG_TYPES.ERROR);
-					return;
-				}
-				if(g.getChosenColor() == -1){
-					g.setChosenColor(color);
-				}
-				if(g.getChosenValue() == -1){
-					g.setChosenValue(value);
-				}
-				if(face.getBackground() == Color.black){
-					if(g.isUseColor()){
-						if(g.getChosenColor() == color){
-							if(face.getBackground() != Color.pink){
-								g.addSelectedCards();
-								face.setBackground(Color.pink);
-								//System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-							}
-						}
-					} else if(g.isUseValue()){
-						if(g.getChosenValue() == value){
-							if(face.getBackground() != Color.pink){
-								g.addSelectedCards();
-								face.setBackground(Color.pink);
-								//System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-							}
-						}
-					}
-				}
+				onCardClick();
 			}
 			
 			@Override
@@ -113,4 +52,21 @@
 			}
 		});
 	}
+	
+	@Override
+	protected void onCardClick(){
+		super.onCardClick();
+		if(isSelected){
+			face.setBackground(Color.pink);
+		} else {
+			face.setBackground(Color.black);
+		}
+	}
+	
+	@Override
+	public void setSelected(boolean set){
+		super.setSelected(set);
+		if(isSelected) face.setBackground(Color.pink);
+		else face.setBackground(Color.black);
+	}
 }
diff --git a/src/game/AbstractGame.java b/src/game/AbstractGame.java
deleted file mode 100644
index f381a7b..0000000
--- a/src/game/AbstractGame.java
+++ /dev/null
@@ -1,392 +0,0 @@
-package game;
-import player.AbstractPlayer;
-
-import java.awt.Point;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-
-import org.json.*;
-
-import card.Card;
-
-public abstract class AbstractGame {
-	/*
-	 * COLORS:
-	 * GREEN
-	 * RED
-	 * YELLOW
-	 * WHITE
-	 * BLUE
-	 * (COLORED)
-	 */
-
-	public enum MSG_TYPES {ERROR, WARNING, INFORMATION, QUESTION};
-	
-	final static int GREEN = 0;
-	final static int RED = 1;
-	final static int YELLOW = 2;
-	final static int WHITE = 3;
-	final static int BLUE = 4;
-	//final static int COLORED = 5;
-	final static int COLORS = 5;
-	int N_PLAYERS = 2;
-	static int CARDS_PER_PLAYER;
-	final static int N_CARDS = 50;
-	int CARDS_IN_DECK;
-	final static int MAX_HINTS = 8;
-	final static int MAX_THUNDERS = 3;
-	int hints;
-	int thunders;
-	ArrayList<Card> cards;
-	Card[][] deck;
-	int[] deckCounter;
-	ArrayList<Card> trash;
-	AbstractPlayer[] players;
-	int currentPlayer;
-	int roundsLeft;
-	
-	int selectedPlayer;
-	int selectedCards;
-	int chosenColor;
-	int chosenValue;
-	boolean useColor;
-	boolean useValue;
-	boolean placeCard;
-	boolean trashCard;
-	boolean won;
-	boolean lost;
-	
-	//Options stuff
-	final File options = new File("options.json");
-	JSONObject root;
-	int difficulty;
-	int fontSize;
-	
-	//Network stuff
-	ServerSocket server;
-	Socket s;
-	boolean isHost;
-	
-	/*public static void main(String[] args) {
-		AbstractGame game = new AbstractGame();
-		game.getPlayer(game.currentPlayer).deactiveCards();
-		System.out.println("Player " + game.currentPlayer + "'s turn");
-	}*/
-
-	public AbstractGame(){
-		init();
-	}
-	
-	protected void init(){
-		loadOptions();
-		loadFont();
-		//establishConnection();
-		CARDS_PER_PLAYER = (N_PLAYERS < 3) ? 5 : 4;
-		hints = MAX_HINTS;
-		thunders = 0;
-		roundsLeft = -1;
-		createPlayers();
-		currentPlayer = 0;
-		resetMoveValues();
-		addCards();
-		CARDS_IN_DECK = cards.size();
-		createUI();
-		dealCards();
-	}
-	
-	protected void loadOptions(){
-		try {
-			JSONTokener tokener = new JSONTokener(options.toURI().toURL().openStream());
-			root = new JSONObject(tokener);
-			difficulty = root.getInt("difficulty");
-			fontSize = root.getInt("fontSize");
-			isHost = root.getBoolean("host");
-			if(difficulty < 0) difficulty = 0;
-			if(fontSize <= 0) fontSize = 20;
-		} catch (JSONException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	
-	protected void establishConnection(){
-		try {
-			if(isHost){
-				server = new ServerSocket(8765);
-				printMessage("Your server is running on port 8765", MSG_TYPES.INFORMATION);
-				s = server.accept();
-				DataInputStream inStream = new DataInputStream(s.getInputStream());
-				String str = inStream.readUTF();
-				System.out.println("Message: " + str);
-				s.close();
-				server.close();
-			} else {
-				s = new Socket("localhost", 8765);
-				DataOutputStream outStream = new DataOutputStream(s.getOutputStream());
-				outStream.writeUTF("Hello");
-				outStream.flush();
-				outStream.close();
-				s.close();
-			}
-		} catch(UnknownHostException uhe){
-			printMessage("Unknown host '???'", MSG_TYPES.ERROR);
-		} catch (IOException e) {
-			printMessage(e.getLocalizedMessage(), MSG_TYPES.ERROR);
-			System.exit(0); //TODO status code
-		}
-		
-	}
-	
-	public void resetMoveValues(){
-		selectedPlayer = -1;
-		chosenColor = -1;
-		chosenValue = -1;
-		selectedCards = 0;
-		useColor = useValue = trashCard = placeCard = false;
-	}
-	
-	protected void createPlayers(){
-		players = new AbstractPlayer[N_PLAYERS];
-		/*for(int i=0; i<NR_PLAYERS; ++i){
-			players[i] = new AbstractPlayer(CARDS_PER_PLAYER, this, i);
-		}*/
-	}
-	
-	private void addCards(){
-		cards = new ArrayList<>();
-		deck = new Card[COLORS][5];
-		deckCounter = new int[5];
-		trash = new ArrayList<>();
-		int[] dist = new int[]{3, 2, 2, 2, 1};
-		int[][] tmp_cards = new int[][]{
-				dist.clone(),
-				dist.clone(),
-				dist.clone(),
-				dist.clone(),
-				dist.clone()
-			};
-		for(int i=0; i<N_CARDS; ++i){
-			Point p = null;
-			do{
-				p = randomPosition();
-			} while(tmp_cards[p.x][p.y] == 0);
-			tmp_cards[p.x][p.y]--;
-			cards.add(new Card(p.x, (p.y + 1), -1, this));
-		}
-	}
-	
-	boolean checkValidMove(){
-		if(selectedCards == 0) return false;
-		if(!hintAvailable() && (useColor || useValue)) return false;
-		if((trashCard || placeCard) && selectedCards == 1) return true;
-		int countCards = 0;
-		for(int i=0; i<CARDS_PER_PLAYER; ++i){
-			AbstractPlayer p = players[selectedPlayer];
-			if(useColor){
-				if(p.getCard(i).getColorInt() == chosenColor) countCards++;
-			} else if(useValue){
-				if(p.getCard(i).getValue() == chosenValue) countCards++;
-			}
-		}
-		return (countCards == selectedCards);
-	}
-	
-	protected abstract void createUI();
-	
-	void moveCardToTrash(int index){
-		trash.add(players[currentPlayer].getCard(index).clone());
-		updateCards(index);
-	}
-	
-	void updateCards(int index){
-		dealCard(index, currentPlayer);
-		players[currentPlayer].setCardInfo(index, "");
-		Card c = players[currentPlayer].getCard(index);
-		//JLabel card = ((SwingPlayer) players[currentPlayer]).getUiCard(index);
-		if(c.getValue() == -1){ //dummy card, no more cards
-			setNoCard(index);
-		}
-	}
-	
-	protected abstract void setNoCard(int index);
-	
-	private void dealCard(int cardID, int playerID){
-		Card card;
-		if(CARDS_IN_DECK > 0){
-			int index = random(CARDS_IN_DECK--);
-			card = cards.remove(index);
-		} else {
-			if(roundsLeft == -1) roundsLeft = N_PLAYERS;
-			card = new Card(3, -1, playerID, this);
-		}
-		players[playerID].setCard(cardID, card);
-	}
-	
-	protected void dealCards(){
-		int dealtCards = 0;
-		for(; dealtCards < CARDS_PER_PLAYER; ++dealtCards){
-			for(int i=0; i<N_PLAYERS; ++i){
-				int index = random(CARDS_IN_DECK--);
-				Card card = cards.remove(index);
-				players[i].setCard(dealtCards, card);
-			}
-		}
-	}
-	
-	boolean hintAvailable(){
-		return (hints > 0);
-	}
-	
-	void setWonOrLost(){
-		won = true;
-		lost = false;
-		for(int i=0; i<COLORS; ++i){
-			System.out.println("Deck " + i + ": " + deckCounter[i]);
-			if(deckCounter[i] != 5){
-				won = false;
-				break;
-			}
-		}
-		if(thunders == MAX_THUNDERS){
-			lost = true;
-			won = false;
-		}
-		if(roundsLeft == 0) lost = true;
-		if(won) printMessage("You won!", MSG_TYPES.INFORMATION);
-		else if(lost) printMessage("You lost...", MSG_TYPES.INFORMATION);
-	}
-	
-	private Point randomPosition(){
-		Point p = new Point();
-		p.x = random(5);
-		p.y = random(5);
-		return p;
-	}
-	
-	private int random(int max){
-		return (int) (Math.random() * max);
-	}
-	
-	public void setSelectedPlayer(int selectedPlayer){
-		this.selectedPlayer = selectedPlayer;
-	}
-	
-	public int getSelectedPlayer(){
-		return selectedPlayer;
-	}
-	
-	public AbstractPlayer getPlayer(int index){
-		return players[index];
-	}
-	
-	public int getCurrentPlayerIndex(){
-		return currentPlayer;
-	}
-	
-	public boolean isTrashCard(){
-		return trashCard;
-	}
-	
-	public boolean isPlaceCard(){
-		return placeCard;
-	}
-	
-	public boolean isUseColor(){
-		return useColor;
-	}
-	
-	public boolean isUseValue(){
-		return useValue;
-	}
-	
-	public int getChosenColor(){
-		return chosenColor;
-	}
-	
-	public void setChosenColor(int chosenColor){
-		this.chosenColor = chosenColor;
-	}
-	
-	public int getChosenValue(){
-		return chosenValue;
-	}
-	
-	public void setChosenValue(int chosenValue){
-		this.chosenValue = chosenValue;
-	}
-	
-	public int getSelectedCards(){
-		return selectedCards;
-	}
-	
-	public void addSelectedCards(){
-		selectedCards++;
-	}
-	
-	public void removeSelectedCards(){
-		selectedCards--;
-	}
-	
-	public int getDifficulty(){
-		return difficulty;
-	}
-	
-	public abstract void loadFont();
-	
-	public int getFontSize(){
-		return fontSize;
-	}
-	
-	public abstract Object getFont();/*{*/
-		//return font;
-	//}
-
-	public abstract void printMessage(String msg, MSG_TYPES type);
-	
-	protected void onNext(){}
-	protected void onColor(){}
-	protected void onValue(){}
-	protected void onTrash(){
-		if(selectedCards > 0){
-			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
-			return;
-		}
-		useColor = false;
-		useValue = false;
-		placeCard = false;
-		trashCard = true;
-	}
-	protected void onPlace(){
-		if(selectedCards > 0){
-			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
-			return;
-		}
-		useColor = false;
-		useValue = false;
-		placeCard = true;
-		trashCard = false;
-	}
-	protected abstract void showTrash();
-	
-	/*private void printArray(int[][] arr){
-		for(int j=0; j<arr.length; ++j){
-			for(int k=0; k<arr[0].length; ++k){
-				System.out.print(arr[j][k] + ", ");
-			}
-			System.out.println("");
-		}
-	}*/
-}
\ No newline at end of file
diff --git a/src/game/BaseGame.java b/src/game/BaseGame.java
new file mode 100644
index 0000000..ecbff71
--- /dev/null
+++ b/src/game/BaseGame.java
@@ -0,0 +1,498 @@
+package game;
+import player.AbstractPlayer;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+
+import org.json.*;
+
+import card.Card;
+
+public abstract class BaseGame {
+	/*
+	 * COLORS:
+	 * GREEN
+	 * RED
+	 * YELLOW
+	 * WHITE
+	 * BLUE
+	 * (COLORED)
+	 */
+
+	public enum MSG_TYPES {ERROR, WARNING, INFORMATION, QUESTION};
+	
+	final static int GREEN = 0;
+	final static int RED = 1;
+	final static int YELLOW = 2;
+	final static int WHITE = 3;
+	final static int BLUE = 4;
+	//final static int COLORED = 5;
+	final static int COLORS = 5;
+	int N_PLAYERS = 2;
+	static int CARDS_PER_PLAYER;
+	final static int N_CARDS = 50;
+	int CARDS_IN_DECK;
+	final static int MAX_HINTS = 8;
+	final static int MAX_THUNDERS = 3;
+	int hints;
+	int thunders;
+	ArrayList<Card> cards;
+	Card[][] deck;
+	int[] deckCounter;
+	ArrayList<Card> trash;
+	AbstractPlayer[] players;
+	int currentPlayer;
+	int roundsLeft;
+	
+	int selectedPlayer;
+	int selectedCards;
+	int chosenColor;
+	int chosenValue;
+	boolean useColor;
+	boolean useValue;
+	boolean placeCard;
+	boolean trashCard;
+	boolean won;
+	boolean lost;
+	
+	//Options stuff
+	final File options = new File("options.json");
+	JSONObject root;
+	int difficulty;
+	int fontSize;
+	
+	//Network stuff
+	ServerSocket server;
+	Socket s;
+	boolean isHost;
+	
+	/*public static void main(String[] args) {
+		AbstractGame game = new AbstractGame();
+		game.getPlayer(game.currentPlayer).deactiveCards();
+		System.out.println("Player " + game.currentPlayer + "'s turn");
+	}*/
+
+	public BaseGame(){
+		init();
+	}
+	
+	protected void init(){
+		loadOptions();
+		loadFont();
+		//establishConnection();
+		CARDS_PER_PLAYER = (N_PLAYERS < 3) ? 5 : 4;
+		hints = MAX_HINTS;
+		thunders = 0;
+		roundsLeft = -1;
+		createPlayers();
+		currentPlayer = 0;
+		resetMoveValues();
+		addCards();
+		CARDS_IN_DECK = cards.size();
+		createUI();
+		dealCards();
+	}
+	
+	protected void loadOptions(){
+		try {
+			JSONTokener tokener = new JSONTokener(options.toURI().toURL().openStream());
+			root = new JSONObject(tokener);
+			difficulty = root.getInt("difficulty");
+			fontSize = root.getInt("fontSize");
+			isHost = root.getBoolean("host");
+			if(difficulty < 0) difficulty = 0;
+			if(fontSize <= 0) fontSize = 20;
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (MalformedURLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	protected void establishConnection(){
+		try {
+			if(isHost){
+				server = new ServerSocket(8765);
+				printMessage("Your server is running on port 8765", MSG_TYPES.INFORMATION);
+				s = server.accept();
+				DataInputStream inStream = new DataInputStream(s.getInputStream());
+				String str = inStream.readUTF();
+				System.out.println("Message: " + str);
+				s.close();
+				server.close();
+			} else {
+				s = new Socket("localhost", 8765);
+				DataOutputStream outStream = new DataOutputStream(s.getOutputStream());
+				outStream.writeUTF("Hello");
+				outStream.flush();
+				outStream.close();
+				s.close();
+			}
+		} catch(UnknownHostException uhe){
+			printMessage("Unknown host '???'", MSG_TYPES.ERROR);
+		} catch (IOException e) {
+			printMessage(e.getLocalizedMessage(), MSG_TYPES.ERROR);
+			System.exit(0); //TODO status code
+		}
+		
+	}
+	
+	public void resetMoveValues(){
+		selectedPlayer = -1;
+		chosenColor = -1;
+		chosenValue = -1;
+		selectedCards = 0;
+		useColor = useValue = trashCard = placeCard = false;
+	}
+	
+	protected void createPlayers(){
+		players = new AbstractPlayer[N_PLAYERS];
+		/*for(int i=0; i<NR_PLAYERS; ++i){
+			players[i] = new AbstractPlayer(CARDS_PER_PLAYER, this, i);
+		}*/
+	}
+	
+	private void addCards(){
+		cards = new ArrayList<>();
+		deck = new Card[COLORS][5];
+		deckCounter = new int[5];
+		trash = new ArrayList<>();
+		int[] dist = new int[]{3, 2, 2, 2, 1};
+		int[][] tmp_cards = new int[][]{
+				dist.clone(),
+				dist.clone(),
+				dist.clone(),
+				dist.clone(),
+				dist.clone()
+			};
+		for(int i=0; i<N_CARDS; ++i){
+			//Point p = null;
+			int[] p = new int[2];
+			do{
+				p = randomPosition();
+			} while(tmp_cards[p[0]][p[1]] == 0);
+			tmp_cards[p[0]][p[1]]--;
+			cards.add(new Card(p[0], (p[1] + 1), -1, this));
+		}
+	}
+	
+	boolean checkValidMove(){
+		if(selectedCards == 0) return false;
+		if(!hintAvailable() && (useColor || useValue)) return false;
+		if((trashCard || placeCard) && selectedCards == 1) return true;
+		int countCards = 0;
+		for(int i=0; i<CARDS_PER_PLAYER; ++i){
+			AbstractPlayer p = players[selectedPlayer];
+			if(useColor){
+				if(p.getCard(i).getColorInt() == chosenColor) countCards++;
+			} else if(useValue){
+				if(p.getCard(i).getValue() == chosenValue) countCards++;
+			}
+		}
+		return (countCards == selectedCards);
+	}
+	
+	protected abstract void createUI();
+	
+	void moveCardToTrash(int index){
+		trash.add(players[currentPlayer].getCard(index).clone());
+		updateCards(index);
+	}
+	
+	void updateCards(int index){
+		dealCard(index, currentPlayer);
+		players[currentPlayer].setCardInfo(index, "");
+		Card c = players[currentPlayer].getCard(index);
+		//JLabel card = ((SwingPlayer) players[currentPlayer]).getUiCard(index);
+		if(c.getValue() == -1){ //dummy card, no more cards
+			setNoCard(index);
+		}
+	}
+	
+	protected abstract void setNoCard(int index);
+	
+	private void dealCard(int cardID, int playerID){
+		Card card;
+		if(CARDS_IN_DECK > 0){
+			int index = random(CARDS_IN_DECK--);
+			card = cards.remove(index);
+		} else {
+			if(roundsLeft == -1) roundsLeft = N_PLAYERS;
+			card = new Card(3, -1, playerID, this);
+		}
+		players[playerID].setCard(cardID, card);
+	}
+	
+	protected void dealCards(){
+		int dealtCards = 0;
+		for(; dealtCards < CARDS_PER_PLAYER; ++dealtCards){
+			for(int i=0; i<N_PLAYERS; ++i){
+				int index = random(CARDS_IN_DECK--);
+				Card card = cards.remove(index);
+				players[i].setCard(dealtCards, card);
+			}
+		}
+	}
+	
+	boolean hintAvailable(){
+		return (hints > 0);
+	}
+	
+	void setWonOrLost(){
+		won = true;
+		lost = false;
+		for(int i=0; i<COLORS; ++i){
+			System.out.println("Deck " + i + ": " + deckCounter[i]);
+			if(deckCounter[i] != 5){
+				won = false;
+				break;
+			}
+		}
+		if(thunders == MAX_THUNDERS){
+			lost = true;
+			won = false;
+		}
+		if(roundsLeft == 0) lost = true;
+		if(won) printMessage("You won!", MSG_TYPES.INFORMATION);
+		else if(lost) printMessage("You lost...", MSG_TYPES.INFORMATION);
+	}
+	
+	private int[] randomPosition(){
+		int[] p = new int[2];
+		p[0] = random(5);
+		p[1] = random(5);
+		return p;
+	}
+	
+	private int random(int max){
+		return (int) (Math.random() * max);
+	}
+	
+	public void setSelectedPlayer(int selectedPlayer){
+		this.selectedPlayer = selectedPlayer;
+	}
+	
+	public int getSelectedPlayer(){
+		return selectedPlayer;
+	}
+	
+	public AbstractPlayer getPlayer(int index){
+		return players[index];
+	}
+	
+	public int getCurrentPlayerIndex(){
+		return currentPlayer;
+	}
+	
+	public boolean isTrashCard(){
+		return trashCard;
+	}
+	
+	public boolean isPlaceCard(){
+		return placeCard;
+	}
+	
+	public boolean isUseColor(){
+		return useColor;
+	}
+	
+	public boolean isUseValue(){
+		return useValue;
+	}
+	
+	public int getChosenColor(){
+		return chosenColor;
+	}
+	
+	public void setChosenColor(int chosenColor){
+		this.chosenColor = chosenColor;
+	}
+	
+	public int getChosenValue(){
+		return chosenValue;
+	}
+	
+	public void setChosenValue(int chosenValue){
+		this.chosenValue = chosenValue;
+	}
+	
+	public int getSelectedCards(){
+		return selectedCards;
+	}
+	
+	public void addSelectedCards(){
+		selectedCards++;
+	}
+	
+	public void removeSelectedCards(){
+		selectedCards--;
+	}
+	
+	public int getDifficulty(){
+		return difficulty;
+	}
+	
+	public abstract void loadFont();
+	
+	public int getFontSize(){
+		return fontSize;
+	}
+	
+	public abstract Object getFont();/*{*/
+		//return font;
+	//}
+
+	public abstract void printMessage(String msg, MSG_TYPES type);
+	
+	protected void removeHint(){
+		hints--;
+	}
+	
+	protected void addHint(){
+		if(hints != MAX_HINTS){
+			hints++;
+			if(hints > MAX_HINTS) hints = MAX_HINTS;
+		}
+	}
+	
+	protected void addThunder(){
+		thunders++;
+	}
+	
+	protected void placeCard(Card c, int color, int value){
+		deckCounter[color]++;
+		deck[color][value] = c;
+	}
+	
+	protected void onNext(){
+		if(!checkValidMove()){
+			printMessage("Please select all cards of the selected color/value", MSG_TYPES.ERROR);
+			return;
+		}
+		if(roundsLeft >= 0) roundsLeft--;
+		int selCardIndex = 0;
+		for(int i=0; i<CARDS_PER_PLAYER; ++i){
+			//SwingPlayer sp = (SwingPlayer) players[selectedPlayer];
+			//JLabel card = sp.getUiCard(i);
+			AbstractPlayer player = players[selectedPlayer];
+			Card card = player.getCard(i);
+			String from = "(from Player " + currentPlayer + ")";
+			if(card.isSelected()){
+				selCardIndex = i;
+				//card.setBackground(Color.black);
+				card.setSelected(false);
+				if(useColor){
+					String color = "- " + Card.intColorToText(chosenColor);
+					
+					player.setCardInfo(i, player.getCardInfo(i) + color + " " + from + "\n");
+				} else if(useValue){
+					String value = "- is " + chosenValue;
+					player.setCardInfo(i, player.getCardInfo(i) + value + " " + from + "\n");
+				}
+			} else {
+				if(useColor){
+					String color = "- not " + Card.intColorToText(chosenColor);
+					player.setCardInfo(i, player.getCardInfo(i) + color + " " + from + "\n");
+				} else if(useValue){
+					String value = "- is not " + chosenValue;
+					player.setCardInfo(i, player.getCardInfo(i) + value + " " + from + "\n");
+				}
+			}
+		}
+		if(useColor || useValue){
+			removeHint();
+		} else if(trashCard){
+			moveCardToTrash(selCardIndex);
+			addHint();
+		} else if(placeCard){
+			Card c = players[currentPlayer].getCard(selCardIndex);
+			int color = c.getColorInt();
+			int value = c.getValue();
+			int deckValue = deckCounter[color] + 1;
+			if(deckValue == value){ //place card possible
+				placeCard(c, color, value-1);
+			} else { //card too high or too low
+				addThunder();
+				moveCardToTrash(selCardIndex);
+			}
+			setWonOrLost();
+			if(lost) return;
+			updateCards(selCardIndex);
+		}
+		players[currentPlayer].activeCards();
+		printMessage("Player " + currentPlayer + " has finished his move!", MSG_TYPES.INFORMATION);
+		currentPlayer++;
+		if(currentPlayer == N_PLAYERS) currentPlayer = 0;
+		players[currentPlayer].deactiveCards();
+		resetMoveValues();
+	}
+	protected void onColor(){
+		if(!hintAvailable()){
+			printMessage("No hints left!", MSG_TYPES.ERROR);
+			return;
+		}
+		if(selectedCards > 0){
+			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
+			return;
+		}
+		useColor = true;
+		useValue = false;
+		placeCard = false;
+		trashCard = false;}
+	protected void onValue(){
+		if(!hintAvailable()){
+			printMessage("No hints left!", MSG_TYPES.ERROR);
+			return;
+		}
+		if(selectedCards > 0){
+			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
+			return;
+		}
+		useValue = true;
+		useColor = false;
+		placeCard = false;
+		trashCard = false;
+	}
+	protected void onTrash(){
+		if(selectedCards > 0){
+			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
+			return;
+		}
+		useColor = false;
+		useValue = false;
+		placeCard = false;
+		trashCard = true;
+	}
+	protected void onPlace(){
+		if(selectedCards > 0){
+			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
+			return;
+		}
+		useColor = false;
+		useValue = false;
+		placeCard = true;
+		trashCard = false;
+	}
+	protected abstract void showTrash();
+	
+	/*private void printArray(int[][] arr){
+		for(int j=0; j<arr.length; ++j){
+			for(int k=0; k<arr[0].length; ++k){
+				System.out.print(arr[j][k] + ", ");
+			}
+			System.out.println("");
+		}
+	}*/
+}
\ No newline at end of file
diff --git a/src/game/Game.java b/src/game/Game.java
deleted file mode 100644
index b90a1ff..0000000
--- a/src/game/Game.java
+++ /dev/null
@@ -1,658 +0,0 @@
-//package game;
-//import player.AbstractPlayer;
-//import player.SwingPlayer;
-//import static card.Card.intColorToText;
-//
-//import java.awt.BorderLayout;
-//import java.awt.Color;
-//import java.awt.Font;
-//import java.awt.GridLayout;
-//import java.awt.Point;
-//import java.awt.event.MouseEvent;
-//import java.awt.event.MouseListener;
-//import java.io.File;
-//import java.io.IOException;
-//import java.net.MalformedURLException;
-//import java.util.ArrayList;
-//
-//import javax.swing.BoxLayout;
-//import javax.swing.JButton;
-//import javax.swing.JFrame;
-//import javax.swing.JLabel;
-//import javax.swing.JPanel;
-//
-//import org.json.*;
-//
-//import card.Card;
-//import card.SwingCard;
-//
-//public class Game {
-//	/*
-//	 * COLORS:
-//	 * GREEN
-//	 * RED
-//	 * YELLOW
-//	 * WHITE
-//	 * BLUE
-//	 * (COLORED)
-//	 */
-//	final static int GREEN = 0;
-//	final static int RED = 1;
-//	final static int YELLOW = 2;
-//	final static int WHITE = 3;
-//	final static int BLUE = 4;
-//	final static int COLORS = 5;
-//	int NR_PLAYERS = 2;
-//	static int CARDS_PER_PLAYER;
-//	final static int NR_OF_CARDS = 50;
-//	static int CARDS_IN_DECK;
-//	final static int MAX_HINTS = 8;
-//	final static int MAX_THUNDERS = 3;
-//	int hints;
-//	int thunders;
-//	ArrayList<Card> cards;
-//	Card[][] deck;
-//	int[] deckCounter;
-//	ArrayList<Card> trash;
-//	AbstractPlayer[] players;
-//	int currentPlayer;
-//	
-//	int selectedPlayer;
-//	int selectedCards;
-//	int chosenColor;
-//	int chosenValue;
-//	boolean useColor;
-//	boolean useValue;
-//	boolean placeCard;
-//	boolean trashCard;
-//	boolean won;
-//	boolean lost;
-//	
-//	//UI STUFF
-//	JFrame mainFrame;
-//	JPanel gamePanel;
-//	JPanel hintPanel;
-//	JPanel thunderPanel;
-//	JPanel buttonPanel;
-//	JPanel deckPanel;
-//	JLabel[][] deckUI;
-//	JButton colorButton;
-//	JButton valueButton;
-//	JButton nextMove;
-//	JButton placeCardButton;
-//	JButton trashCardButton;
-//	JLabel[] hintUI;
-//	JLabel[] thunderUI;
-//	JPanel[] playersUI;
-//	Font font;
-//	
-//	//Options stuff
-//	final File options = new File("options.json");
-//	JSONObject root;
-//	int difficulty;
-//	int fontSize;
-//	
-//	public static void main(String[] args) {
-//		Game game = new Game();
-//		game.getPlayer(game.currentPlayer).deactiveCards();
-//		System.out.println("Player " + game.currentPlayer + "'s turn");
-//	}
-//
-//	public Game(){
-//		init();
-//	}
-//	
-//	private void init(){
-//		loadOptions();
-//		font = new Font("Shanghai", Font.PLAIN, fontSize);
-//		CARDS_PER_PLAYER = (NR_PLAYERS < 3) ? 5 : 4;
-//		hints = MAX_HINTS;
-//		thunders = 0;
-//		createPlayers();
-//		currentPlayer = 0;
-//		resetMoveValues();
-//		addCards();
-//		CARDS_IN_DECK = cards.size();
-//		createUI();
-//		dealCards();
-//	}
-//	
-//	private void loadOptions(){
-//		try {
-//			JSONTokener tokener = new JSONTokener(options.toURI().toURL().openStream());
-//			root = new JSONObject(tokener);
-//			difficulty = root.getInt("difficulty");
-//			fontSize = root.getInt("fontSize");
-//			if(difficulty < 0) difficulty = 0;
-//			if(fontSize <= 0) fontSize = 20;
-//			System.out.println("FontSize: " + fontSize);
-//			System.out.println("Difficulty: " + difficulty);
-//		} catch (JSONException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		} catch (MalformedURLException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		} catch (IOException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//	}
-//	
-//	public void resetMoveValues(){
-//		selectedPlayer = -1;
-//		chosenColor = -1;
-//		chosenValue = -1;
-//		selectedCards = 0;
-//		useColor = useValue = trashCard = placeCard = false;
-//	}
-//	
-//	private void createPlayers(){
-//		players = new AbstractPlayer[NR_PLAYERS];
-//		for(int i=0; i<NR_PLAYERS; ++i){
-//			players[i] = new SwingPlayer(CARDS_PER_PLAYER, this, i);
-//		}
-//	}
-//	
-//	private void addCards(){
-//		cards = new ArrayList<>();
-//		deck = new Card[COLORS][5];
-//		deckCounter = new int[5];
-//		trash = new ArrayList<>();
-//		int[] dist = new int[]{3, 2, 2, 2, 1};
-//		int[][] tmp_cards = new int[][]{
-//				dist.clone(),
-//				dist.clone(),
-//				dist.clone(),
-//				dist.clone(),
-//				dist.clone()
-//			};
-//		for(int i=0; i<NR_OF_CARDS; ++i){
-//			Point p = null;
-//			do{
-//				p = randomPosition();
-//			} while(tmp_cards[p.x][p.y] == 0);
-//			tmp_cards[p.x][p.y]--;
-//			cards.add(new SwingCard(p.x, (p.y + 1), -1, this));
-//		}
-//	}
-//	
-//	private boolean checkValidMove(){
-//		if(selectedCards == 0) return false;
-//		if(!hintAvailable() && (useColor || useValue)) return false;
-//		if((trashCard || placeCard) && selectedCards == 1) return true;
-//		int countCards = 0;
-//		for(int i=0; i<CARDS_PER_PLAYER; ++i){
-//			AbstractPlayer p = players[selectedPlayer];
-//			if(useColor){
-//				if(p.getCard(i).getColorInt() == chosenColor) countCards++;
-//			} else if(useValue){
-//				if(p.getCard(i).getValue() == chosenValue) countCards++;
-//			}
-//		}
-//		return (countCards == selectedCards);
-//	}
-//	
-//	private void createUI(){
-//		mainFrame = new JFrame("Hanabi");
-//		mainFrame.setSize(1000, 650);
-//		mainFrame.setLocation(0, 0);
-//		mainFrame.setLayout(new BorderLayout());
-//		mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-//		mainFrame.getContentPane().setBackground(Color.black);
-//		mainFrame.setVisible(true);
-//		gamePanel = new JPanel();
-//		gamePanel.setLayout(new BoxLayout(gamePanel, BoxLayout.Y_AXIS));
-//		GridLayout deckLayout = new GridLayout(COLORS, 5);
-//		deckPanel = new JPanel(deckLayout);
-//		deckPanel.setBackground(Color.black);
-//		deckUI = new JLabel[COLORS][5];
-//		for(int i=0; i<COLORS; ++i){
-//			for(int j=0; j<5; ++j){
-//				JLabel tmp = new JLabel("Not set");
-//				tmp.setBackground(Color.black);
-//				tmp.setForeground(Color.white);
-//				tmp.setFont(font);
-//				deckUI[i][j] = tmp;
-//				deckPanel.add(deckUI[i][j]);
-//			}
-//		}
-//		hintPanel = new JPanel();
-//		thunderPanel = new JPanel();
-//		buttonPanel = new JPanel();
-//		colorButton = new JButton("Color");
-//		valueButton = new JButton("Value");
-//		nextMove = new JButton("Next");
-//		placeCardButton = new JButton("Place");
-//		trashCardButton = new JButton("Trash");
-//		colorButton.setFont(font);
-//		valueButton.setFont(font);
-//		nextMove.setFont(font);
-//		placeCardButton.setFont(font);
-//		trashCardButton.setFont(font);
-//		buttonPanel.add(colorButton);
-//		buttonPanel.add(valueButton);
-//		buttonPanel.add(nextMove);
-//		buttonPanel.add(placeCardButton);
-//		buttonPanel.add(trashCardButton);
-//		mainFrame.add(gamePanel, BorderLayout.CENTER);
-//		gamePanel.add(hintPanel);
-//		gamePanel.add(thunderPanel);
-//		gamePanel.add(buttonPanel);
-//		gamePanel.add(deckPanel);
-//		hintUI = new JLabel[MAX_HINTS];
-//		for(int i=0; i<MAX_HINTS; ++i){
-//			JLabel tmp = new JLabel();
-//			tmp.setText("1");
-//			tmp.setBackground(Color.white);
-//			tmp.setName("Hint_" + i);
-//			tmp.setFont(font);
-//			hintPanel.add(tmp);
-//			hintUI[i] = tmp;			
-//		}
-//		thunderUI = new JLabel[MAX_THUNDERS];
-//		for(int i=0;i<MAX_THUNDERS; ++i){
-//			JLabel tmp = new JLabel();
-//			tmp.setText("0");
-//			tmp.setBackground(Color.white);
-//			tmp.setName("Thunder_" + i);
-//			tmp.setFont(font);
-//			thunderPanel.add(tmp);
-//			thunderUI[i] = tmp;
-//		}
-//		colorButton.addMouseListener(new MouseListener(){			
-//			@Override
-//			public void mouseReleased(MouseEvent e) {
-//				if(!hintAvailable()){
-//					System.out.println("No hints left!");
-//					return;
-//				}
-//				if(selectedCards > 0){
-//					System.out.println("Please deselect all cards first");
-//					return;
-//				}
-//				useColor = true;
-//				useValue = false;
-//				placeCard = false;
-//				trashCard = false;
-//			}			
-//			@Override
-//			public void mousePressed(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseExited(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseEntered(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseClicked(MouseEvent e) {
-//			}
-//		});
-//		valueButton.addMouseListener(new MouseListener(){			
-//			@Override
-//			public void mouseReleased(MouseEvent e) {
-//				if(!hintAvailable()){
-//					System.out.println("No hints left!");
-//					return;
-//				}
-//				if(selectedCards > 0){
-//					System.out.println("Please deselect all cards first");
-//					return;
-//				}
-//				useValue = true;
-//				useColor = false;
-//				placeCard = false;
-//				trashCard = false;
-//			}			
-//			@Override
-//			public void mousePressed(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseExited(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseEntered(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseClicked(MouseEvent e) {
-//			}
-//		});
-//		nextMove.addMouseListener(new MouseListener(){			
-//			@Override
-//			public void mouseReleased(MouseEvent e) {
-//				if(!checkValidMove()){
-//					System.out.println("Please select all cards of the selected color/value");
-//					return;
-//				}
-//				int selCardIndex = 0;
-//				for(int i=0; i<CARDS_PER_PLAYER; ++i){
-//					SwingPlayer sp = (SwingPlayer) players[selectedPlayer];
-//					JLabel card = sp.getUiCard(i);
-//					String from = "(from Player " + currentPlayer + ")";
-//					if(card.getBackground() == Color.pink){
-//						selCardIndex = i;
-//						card.setBackground(Color.black);
-//						if(useColor){
-//							String color = "- " + intColorToText(chosenColor);
-//							sp.setCardInfo(i, sp.getCardInfo(i) + color + " " + from + "\n");
-//						} else if(useValue){
-//							String value = "- is " + chosenValue;
-//							sp.setCardInfo(i, sp.getCardInfo(i) + value + " " + from + "\n");
-//						}
-//					} else {
-//						if(useColor){
-//							String color = "- not " + intColorToText(chosenColor);
-//							sp.setCardInfo(i, sp.getCardInfo(i) + color + " " + from + "\n");
-//						} else if(useValue){
-//							String value = "- is not " + chosenValue;
-//							sp.setCardInfo(i, sp.getCardInfo(i) + value + " " + from + "\n");
-//						}
-//					}
-//				}
-//				if(useColor || useValue){
-//					hintUI[hints-1].setText("0");
-//					hints--;
-//				} else if(trashCard){
-//					moveCardToTrash(selCardIndex);
-//					if(hints != MAX_HINTS){
-//						hintUI[hints].setText("1");
-//						hints++;
-//						if(hints > MAX_HINTS) hints = MAX_HINTS;
-//					}
-//				} else if(placeCard){
-//					Card c = players[currentPlayer].getCard(selCardIndex);
-//					int color = c.getColorInt();
-//					int value = c.getValue();
-//					int deckValue = deckCounter[color] + 1;
-//					if(deckValue == value){ //place card possible
-//						deckCounter[color]++;
-//						deck[color][value-1] = c;
-//						deckUI[color][value-1].setText(value + "");
-//						deckUI[color][value-1].setForeground(c.getColor());
-//						setWonOrLost();
-//					} else { //card too high or too low
-//						thunderUI[thunders++].setText("1");
-//						moveCardToTrash(selCardIndex);
-//						setWonOrLost();
-//						if(lost) return;
-//					}
-//					//dealCard(selCardIndex, currentPlayer);
-//					updateCards(selCardIndex);
-//				}
-//				players[currentPlayer].activeCards();
-//				System.out.println("Player " + currentPlayer + " has finished his move!");
-//				currentPlayer++;
-//				if(currentPlayer == NR_PLAYERS) currentPlayer = 0;
-//				players[currentPlayer].deactiveCards();
-//				resetMoveValues();
-//				System.out.println(CARDS_IN_DECK + " cards left.");
-//				System.out.println(trash.size() + " cards in trash");
-//				System.out.println("Player " + currentPlayer + "'s turn");
-//			}			
-//			@Override
-//			public void mousePressed(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseExited(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseEntered(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseClicked(MouseEvent e) {
-//			}
-//		});
-//		trashCardButton.addMouseListener(new MouseListener(){			
-//			@Override
-//			public void mouseReleased(MouseEvent e) {
-//				if(selectedCards > 0){
-//					System.out.println("Please deselect all cards first");
-//					return;
-//				}
-//				useColor = false;
-//				useValue = false;
-//				placeCard = false;
-//				trashCard = true;
-//			}			
-//			@Override
-//			public void mousePressed(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseExited(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseEntered(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseClicked(MouseEvent e) {
-//			}
-//		});
-//		placeCardButton.addMouseListener(new MouseListener(){			
-//			@Override
-//			public void mouseReleased(MouseEvent e) {
-//				if(selectedCards > 0){
-//					System.out.println("Please deselect all cards first");
-//					return;
-//				}
-//				useColor = false;
-//				useValue = false;
-//				placeCard = true;
-//				trashCard = false;
-//			}			
-//			@Override
-//			public void mousePressed(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseExited(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseEntered(MouseEvent e) {
-//			}			
-//			@Override
-//			public void mouseClicked(MouseEvent e) {
-//			}
-//		});
-//	}
-//	
-//	private void moveCardToTrash(int index){
-//		trash.add(players[currentPlayer].getCard(index));
-//		updateCards(index);
-//	}
-//	
-//	private void updateCards(int index){
-//		dealCard(index, currentPlayer);
-//		players[currentPlayer].setCardInfo(index, "");
-//		Card c = players[currentPlayer].getCard(index);
-//		//JLabel card = ((SwingPlayer) players[currentPlayer]).getUiCard(index);
-//		AbstractPlayer card = players[currentPlayer];
-//		if(c.getValue() == -1){ //dummy card, no more cards
-//			card.setColor(index, 255, 122, 0);
-//			card.setText(index, "No Cards left");
-//			card.unsetListeners(index);
-//		}
-//	}
-//	
-//	private void dealCard(int cardID, int playerID){
-//		SwingCard card;
-//		if(CARDS_IN_DECK > 0){
-//			int index = random(CARDS_IN_DECK--);
-//			card = (SwingCard) cards.remove(index);
-//		} else {
-//			card = new SwingCard(3, -1, playerID, this);
-//		}
-//		players[playerID].setCard(cardID, card);
-//	}
-//	
-//	private void dealCards(){
-//		int dealtCards = 0;
-//		for(; dealtCards < CARDS_PER_PLAYER; ++dealtCards){
-//			for(int i=0; i<NR_PLAYERS; ++i){
-//				int index = random(CARDS_IN_DECK--);
-//				SwingCard card = (SwingCard) cards.remove(index);
-//				players[i].setCard(dealtCards, card);
-//			}
-//		}
-//		/*
-//		 * PLAYER 0: SOUTH
-//		 * PLAYER 1: EAST
-//		 * PLAYER 2: NORTH
-//		 * PLAYER 3: WEST
-//		 */
-//		for(int i=0; i<NR_PLAYERS; ++i){
-//			JPanel playerContainer = ((SwingPlayer) players[i]).getContainer();
-//			BoxLayout containerLayout = null;
-//			String playerSide = null;
-//			switch(i){
-//			case 0:
-//				playerSide = BorderLayout.SOUTH;
-//				containerLayout = new BoxLayout(playerContainer, BoxLayout.X_AXIS);
-//				break;
-//			case 1:
-//				playerSide = BorderLayout.EAST;
-//				containerLayout = new BoxLayout(playerContainer, BoxLayout.Y_AXIS);
-//				break;
-//			case 2:
-//				playerSide = BorderLayout.NORTH;
-//				containerLayout = new BoxLayout(playerContainer, BoxLayout.X_AXIS);
-//				break;
-//			case 3:
-//				if(NR_PLAYERS == 5){
-//					playerSide = BorderLayout.NORTH;
-//					containerLayout = new BoxLayout(playerContainer, BoxLayout.X_AXIS);
-//				}
-//				else{
-//					playerSide = BorderLayout.WEST;
-//					containerLayout = new BoxLayout(playerContainer, BoxLayout.Y_AXIS);
-//				}
-//				break;
-//			case 4:
-//				playerSide = BorderLayout.WEST;
-//				containerLayout = new BoxLayout(playerContainer, BoxLayout.Y_AXIS);
-//				break;
-//			}
-//			playerContainer.setLayout(containerLayout);
-//			playerContainer.setBackground(Color.black);
-//			for(int j=0; j<CARDS_PER_PLAYER; ++j){
-//				AbstractPlayer curr = players[i];
-//				curr.setName(j, i + "_card" + j);
-//				curr.setSize(j, 50, 50);
-//			}
-//			mainFrame.add(playerContainer, playerSide);
-//		}
-//	}
-//	
-//	private boolean hintAvailable(){
-//		return (hints > 0);
-//	}
-//	
-//	private void setWonOrLost(){
-//		won = true;
-//		lost = false;
-//		for(int i=0; i<COLORS; ++i){
-//			System.out.println("Deck " + i + ": " + deckCounter[i]);
-//			if(deckCounter[i] != 5){
-//				won = false;
-//				break;
-//			}
-//		}
-//		if(thunders == MAX_THUNDERS){
-//			lost = true;
-//			won = false;
-//		}
-//		if(won) System.out.println("YOU WON!");
-//		if(lost) System.out.println("YOU LOST...");
-//	}
-//	
-//	private Point randomPosition(){
-//		Point p = new Point();
-//		p.x = random(5);
-//		p.y = random(5);
-//		return p;
-//	}
-//	
-//	private int random(int max){
-//		return (int) (Math.random() * max);
-//	}
-//	
-//	public void setSelectedPlayer(int selectedPlayer){
-//		this.selectedPlayer = selectedPlayer;
-//	}
-//	
-//	public int getSelectedPlayer(){
-//		return selectedPlayer;
-//	}
-//	
-//	public AbstractPlayer getPlayer(int index){
-//		return players[index];
-//	}
-//	
-//	public int getCurrentPlayerIndex(){
-//		return currentPlayer;
-//	}
-//	
-//	public boolean isTrashCard(){
-//		return trashCard;
-//	}
-//	
-//	public boolean isPlaceCard(){
-//		return placeCard;
-//	}
-//	
-//	public boolean isUseColor(){
-//		return useColor;
-//	}
-//	
-//	public boolean isUseValue(){
-//		return useValue;
-//	}
-//	
-//	public int getChosenColor(){
-//		return chosenColor;
-//	}
-//	
-//	public void setChosenColor(int chosenColor){
-//		this.chosenColor = chosenColor;
-//	}
-//	
-//	public int getChosenValue(){
-//		return chosenValue;
-//	}
-//	
-//	public void setChosenValue(int chosenValue){
-//		this.chosenValue = chosenValue;
-//	}
-//	
-//	public int getSelectedCards(){
-//		return selectedCards;
-//	}
-//	
-//	public void addSelectedCards(){
-//		selectedCards++;
-//	}
-//	
-//	public void removeSelectedCards(){
-//		selectedCards--;
-//	}
-//	
-//	public int getDifficulty(){
-//		return difficulty;
-//	}
-//	
-//	public int getFontSize(){
-//		return fontSize;
-//	}
-//	
-//	public Font getFont(){
-//		return font;
-//	}
-//	
-//	/*private void printArray(int[][] arr){
-//		for(int j=0; j<arr.length; ++j){
-//			for(int k=0; k<arr[0].length; ++k){
-//				System.out.print(arr[j][k] + ", ");
-//			}
-//			System.out.println("");
-//		}
-//	}*/
-//}
\ No newline at end of file
diff --git a/src/game/SwingGame.java b/src/game/SwingGame.java
index 1a2b6a6..df2704c 100644
--- a/src/game/SwingGame.java
+++ b/src/game/SwingGame.java
@@ -18,7 +18,7 @@
 import player.AbstractPlayer;
 import player.SwingPlayer;
 
-public class SwingGame extends AbstractGame {
+public class SwingGame extends BaseGame {
 	//UI STUFF
 	JFrame mainFrame;
 	JPanel gamePanel;
@@ -305,109 +305,44 @@
 		    title,
 		    jType);
 	}
+	
+	@Override
+	protected void removeHint(){
+		super.removeHint();
+		hintUI[hints].setText("0");
+	}
+	
+	@Override
+	protected void addHint(){
+		super.addHint();
+		hintUI[hints-1].setText("1");
+	}
+	
+	@Override
+	protected void addThunder(){
+		super.addThunder();
+		thunderUI[thunders-1].setText("1");
+	}
+	
+	@Override
+	protected void placeCard(Card c, int color, int value){
+		deckUI[color][value].setText(value + "");
+		deckUI[color][value].setForeground(c.getColor());
+	}
 
 	@Override
 	protected void onNext(){
 		super.onNext();
-		if(!checkValidMove()){
-			printMessage("Please select all cards of the selected color/value", MSG_TYPES.ERROR);
-			return;
-		}
-		if(roundsLeft >= 0) roundsLeft--;
-		int selCardIndex = 0;
-		for(int i=0; i<CARDS_PER_PLAYER; ++i){
-			SwingPlayer sp = (SwingPlayer) players[selectedPlayer];
-			JLabel card = sp.getUiCard(i);
-			String from = "(from Player " + currentPlayer + ")";
-			if(card.getBackground() == Color.pink){
-				selCardIndex = i;
-				card.setBackground(Color.black);
-				if(useColor){
-					String color = "- " + Card.intColorToText(chosenColor);
-					sp.setCardInfo(i, sp.getCardInfo(i) + color + " " + from + "\n");
-				} else if(useValue){
-					String value = "- is " + chosenValue;
-					sp.setCardInfo(i, sp.getCardInfo(i) + value + " " + from + "\n");
-				}
-			} else {
-				if(useColor){
-					String color = "- not " + Card.intColorToText(chosenColor);
-					sp.setCardInfo(i, sp.getCardInfo(i) + color + " " + from + "\n");
-				} else if(useValue){
-					String value = "- is not " + chosenValue;
-					sp.setCardInfo(i, sp.getCardInfo(i) + value + " " + from + "\n");
-				}
-			}
-		}
-		if(useColor || useValue){
-			hintUI[hints-1].setText("0");
-			hints--;
-		} else if(trashCard){
-			moveCardToTrash(selCardIndex);
-			if(hints != MAX_HINTS){
-				hintUI[hints].setText("1");
-				hints++;
-				if(hints > MAX_HINTS) hints = MAX_HINTS;
-			}
-		} else if(placeCard){
-			Card c = players[currentPlayer].getCard(selCardIndex);
-			int color = c.getColorInt();
-			int value = c.getValue();
-			int deckValue = deckCounter[color] + 1;
-			if(deckValue == value){ //place card possible
-				deckCounter[color]++;
-				deck[color][value-1] = c;
-				deckUI[color][value-1].setText(value + "");
-				deckUI[color][value-1].setForeground(c.getColor());
-			} else { //card too high or too low
-				thunderUI[thunders++].setText("1");
-				moveCardToTrash(selCardIndex);
-			}
-			setWonOrLost();
-			if(lost) return;
-			//dealCard(selCardIndex, currentPlayer);
-			updateCards(selCardIndex);
-		}
-		players[currentPlayer].activeCards();
-		printMessage("Player " + currentPlayer + " has finished his move!", MSG_TYPES.INFORMATION);
-		currentPlayer++;
-		if(currentPlayer == N_PLAYERS) currentPlayer = 0;
-		players[currentPlayer].deactiveCards();
-		resetMoveValues();
 	}
 	
 	@Override
 	protected void onColor(){
 		super.onColor();
-		if(!hintAvailable()){
-			printMessage("No hints left!", MSG_TYPES.ERROR);
-			return;
-		}
-		if(selectedCards > 0){
-			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
-			return;
-		}
-		useColor = true;
-		useValue = false;
-		placeCard = false;
-		trashCard = false;
 	}
 	
 	@Override
 	protected void onValue(){
 		super.onValue();
-		if(!hintAvailable()){
-			printMessage("No hints left!", MSG_TYPES.ERROR);
-			return;
-		}
-		if(selectedCards > 0){
-			printMessage("Please deselect all cards first", MSG_TYPES.ERROR);
-			return;
-		}
-		useValue = true;
-		useColor = false;
-		placeCard = false;
-		trashCard = false;
 	}
 	
 	@Override
@@ -423,6 +358,7 @@
 	@Override
 	protected void showTrash(){
 		JPanel panel = new JPanel();
+		panel.setBackground(Color.black);
 		for(Card c : trash){
 			JLabel label = new JLabel(c.getValue() + "");
 			label.setForeground(c.getColor());
diff --git a/src/player/AbstractPlayer.java b/src/player/AbstractPlayer.java
index 51895ec..13d55ff 100644
--- a/src/player/AbstractPlayer.java
+++ b/src/player/AbstractPlayer.java
@@ -1,15 +1,15 @@
 package player;
 
 import card.Card;
-import game.AbstractGame;
+import game.BaseGame;
 
 public abstract class AbstractPlayer {
 	protected Card[] cards;
 	protected String[] cardInfos;
 	protected int Id;
-	protected AbstractGame g;
+	protected BaseGame g;
 	
-	public AbstractPlayer(int nrOfCards, AbstractGame g, int Id){
+	public AbstractPlayer(int nrOfCards, BaseGame g, int Id){
 		cards = new Card[nrOfCards];
 		cardInfos = new String[nrOfCards];
 		this.g = g;
diff --git a/src/player/SwingPlayer.java b/src/player/SwingPlayer.java
index 5977f4c..92462a4 100644
--- a/src/player/SwingPlayer.java
+++ b/src/player/SwingPlayer.java
@@ -14,7 +14,6 @@
 	private final static String HTML_BEGIN = "<html>";
 	private final static String HTML_END = "</html>";
 	private final static String HTML_NEWLINE = "<br/>";
-	//private Card[] swingCards;
 	private JLabel[] labels;
 	private JPanel container;
 	public SwingPlayer(int nrOfCards, SwingGame swingGame, int Id){
@@ -88,15 +87,18 @@
 		((SwingCard) cards[index]).getFace().setForeground(new Color(r, g, b));
 	}
 
-	@Override
-	public int[] getColor(int index) {
+	private int[] swingColorToInt(Color c){
 		int[] color = new int[3];
-		Color c = ((SwingCard) cards[index]).getFace().getForeground();
 		color[0] = c.getRed();
 		color[1] = c.getGreen();
 		color[2] = c.getBlue();
 		return color;
 	}
+	
+	@Override
+	public int[] getColor(int index) {
+		return swingColorToInt(((SwingCard) cards[index]).getFace().getForeground());
+	}
 
 	@Override
 	public void setBackground(int index, int r, int g, int b) {
@@ -105,12 +107,7 @@
 
 	@Override
 	public int[] getBackground(int index) {
-		int[] color = new int[3];
-		Color c = ((SwingCard) cards[index]).getFace().getBackground();
-		color[0] = c.getRed();
-		color[1] = c.getGreen();
-		color[2] = c.getBlue();
-		return color;
+		return swingColorToInt(((SwingCard) cards[index]).getFace().getBackground());
 	}
 
 	@Override
@@ -143,7 +140,6 @@
 	public void activeCards(){
 		for(int i=0; i<cards.length; ++i){
 			((SwingCard) cards[i]).getFace().setText(getCard(i).getValue() + "");
-			//swingCards[i].getFace().setEnabled(true);
 			((SwingCard) cards[i]).getFace().setForeground(getCard(i).getColor());
 		}
 	}