diff --git a/src/game/Game.java b/src/game/Game.java
index 085a91c..a829291 100644
--- a/src/game/Game.java
+++ b/src/game/Game.java
@@ -1,5 +1,8 @@
 package game;
 import player.AbstractPlayer;
+import player.SwingPlayer;
+import static game.Card.intColorToText;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
@@ -14,7 +17,6 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 
 
 public class Game {
@@ -33,7 +35,7 @@
 	final static int WHITE = 3;
 	final static int BLUE = 4;
 	final static int COLORS = 5;
-	final static int NR_PLAYERS = 2;
+	int NR_PLAYERS = 3;
 	static int CARDS_PER_PLAYER;
 	final static int NR_OF_CARDS = 50;
 	static int CARDS_IN_DECK;
@@ -41,23 +43,23 @@
 	final static int MAX_THUNDERS = 3;
 	int hints;
 	int thunders;
-	static ArrayList<Card> cards;
-	static Card[][] deck;
-	static int[] deckCounter;
-	static ArrayList<Card> trash;
-	static AbstractPlayer[] players;
-	static int currentPlayer;
+	ArrayList<Card> cards;
+	Card[][] deck;
+	int[] deckCounter;
+	ArrayList<Card> trash;
+	AbstractPlayer[] players;
+	int currentPlayer;
 	
-	static int selectedPlayer;
-	static int selectedCards;
-	static int chosenColor;
-	static int chosenValue;
-	static boolean useColor;
-	static boolean useValue;
-	static boolean placeCard;
-	static boolean trashCard;
-	static boolean won;
-	static boolean lost;
+	int selectedPlayer;
+	int selectedCards;
+	int chosenColor;
+	int chosenValue;
+	boolean useColor;
+	boolean useValue;
+	boolean placeCard;
+	boolean trashCard;
+	boolean won;
+	boolean lost;
 	
 	//UI STUFF
 	JFrame mainFrame;
@@ -74,12 +76,13 @@
 	JButton trashCardButton;
 	JLabel[] hintUI;
 	JLabel[] thunderUI;
-	static JPanel[] playersUI;
+	JPanel[] playersUI;
 	
 	
 	public static void main(String[] args) {
-		/*Game game = */new Game();
-		System.out.println("Player " + currentPlayer + "'s turn");
+		Game game = new Game();
+		game.getPlayer(game.currentPlayer).deactiveCards();
+		System.out.println("Player " + game.currentPlayer + "'s turn");
 	}
 
 	public Game(){
@@ -99,7 +102,7 @@
 		dealCards();
 	}
 	
-	private void resetMoveValues(){
+	public void resetMoveValues(){
 		selectedPlayer = -1;
 		chosenColor = -1;
 		chosenValue = -1;
@@ -109,19 +112,19 @@
 	
 	private void createPlayers(){
 		players = new AbstractPlayer[NR_PLAYERS];
-		playersUI = new JPanel[NR_PLAYERS];
+		//playersUI = new JPanel[NR_PLAYERS];
 		for(int i=0; i<NR_PLAYERS; ++i){
-			players[i] = new SwingPlayer(CARDS_PER_PLAYER);
-			playersUI[i] = new JPanel();
+			players[i] = new SwingPlayer(CARDS_PER_PLAYER, this);
+			//playersUI[i] = new JPanel();
 		}
-		players[0].print();
+		//players[0].print();
 	}
 	
 	private void addCards(){
-		cards = new ArrayList<Card>();
+		cards = new ArrayList<>();
 		deck = new Card[COLORS][5];
 		deckCounter = new int[5];
-		trash = new ArrayList<Card>();
+		trash = new ArrayList<>();
 		int[] dist = new int[]{3, 2, 2, 2, 1};
 		int[][] tmp_cards = new int[][]{
 				dist.clone(),
@@ -284,23 +287,24 @@
 				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);
+							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);
+							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);
+							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);
+							String value = "- is not " + chosenValue;
+							sp.setCardInfo(i, sp.getCardInfo(i) + value + " " + from + "\n");
 						}
 					}
 				}
@@ -322,8 +326,9 @@
 					if(deckValue == value){ //place card possible
 						deckCounter[color]++;
 						deck[color][value-1] = c;
-						deckUI[color][value-1].setText("Value: " + value);
+						deckUI[color][value-1].setText(value + "");
 						deckUI[color][value-1].setForeground(c.getColor());
+						deckUI[color][value-1].setFont(new Font("Shanghai", Font.PLAIN, 20));
 						setWonOrLost();
 					} else { //card too high or too low
 						thunderUI[thunders++].setText("1");
@@ -331,12 +336,14 @@
 						setWonOrLost();
 						if(lost) return;
 					}
-					dealCard(selCardIndex, currentPlayer);
+					//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");
@@ -389,8 +396,8 @@
 				}
 				useColor = false;
 				useValue = false;
-				trashCard = false;
 				placeCard = true;
+				trashCard = false;
 			}			
 			@Override
 			public void mousePressed(MouseEvent e) {
@@ -416,14 +423,13 @@
 		dealCard(index, currentPlayer);
 		players[currentPlayer].setCardInfo(index, "");
 		Card c = players[currentPlayer].getCard(index);
-		JLabel card = ((SwingPlayer) players[currentPlayer]).getUiCard(index);
+		//JLabel card = ((SwingPlayer) players[currentPlayer]).getUiCard(index);
+		AbstractPlayer card = players[currentPlayer];
 		if(c.getValue() == -1){ //dummy card, no more cards
-			card.setForeground(Color.orange);
-			card.setText("No Cards left");
-			MouseListener[] listeners = card.getMouseListeners();
-			for(int i=0; i<listeners.length; ++i){
-				card.removeMouseListener(listeners[i]);
-			}
+			//card.setForeground(Color.orange);
+			card.setColor(index, 255, 122, 0);
+			card.setText(index, "No Cards left");
+			card.unsetListeners(index);
 		}
 	}
 	
@@ -478,103 +484,10 @@
 			playerContainer.setLayout(containerLayout);
 			playerContainer.setBackground(Color.black);
 			for(int j=0; j<CARDS_PER_PLAYER; ++j){
-				JLabel curr = ((SwingPlayer) players[i]).getUiCard(j);
-				curr.setName(i + "_card" + j);
-				curr.setHorizontalAlignment(SwingConstants.CENTER);
-				curr.setSize(50, 50);
-				Font f = curr.getFont();
-				curr.setFont(new Font(f.getFontName(), f.getStyle(), f.getSize()*2));
-				curr.addMouseListener(new MouseListener() {
-					@Override
-					public void mouseReleased(MouseEvent e) {
-						JLabel label = (JLabel) e.getComponent();
-						String name = label.getName();
-						int clickedPlayer = Integer.parseInt(name.substring(0, 1));
-						int clickedCard = Integer.parseInt(name.substring(name.length()-1));
-						Card card = players[clickedPlayer].getCard(clickedCard);
-						int clickedValue = card.getValue();
-						int clickedColor = card.getColorInt();
-						if(label.getBackground() == Color.pink){
-							selectedCards--;
-							label.setBackground(Color.black);
-							System.out.println("Removed card #" + clickedCard + "(" + card.getColorInt() + ", " + card.getValue() + ")");
-							if(selectedCards == 0){
-								resetMoveValues();
-							}
-						}
-						if(!useColor && !useValue && !trashCard && !placeCard){
-							System.out.println("Please choose move type first");
-							return;
-						}
-						if(clickedPlayer == currentPlayer){
-							if(useColor || useValue){
-								System.out.println("Please don't select your own cards!");
-								return;
-							} else if((trashCard || placeCard) && selectedCards == 1){
-								System.out.println("You already selected a card!");
-								return;
-							}
-						} else if(clickedPlayer != currentPlayer && (trashCard || placeCard)){
-							System.out.println("Please select your own cards");
-							return;
-						}
-						if(selectedPlayer == -1){
-							selectedPlayer = clickedPlayer;
-							chosenColor = clickedColor;
-							chosenValue = clickedValue;
-							selectedCards++;
-							System.out.println("Selected player #" + selectedPlayer);
-							label.setBackground(Color.pink);
-							System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-							return;
-						}
-						if(selectedPlayer != clickedPlayer){
-							System.out.println("Please choose a card of the selected player or unselect all cards and choose another player.");
-							return;
-						}
-						if(chosenColor == -1){
-							chosenColor = clickedColor;
-						}
-						if(chosenValue == -1){
-							chosenValue = clickedValue;
-						}
-						if(label.getBackground() == Color.black){
-							if(useColor){
-								if(chosenColor == clickedColor){
-									if(label.getBackground() != Color.pink){
-										selectedCards++;
-										label.setBackground(Color.pink);
-										System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-									}
-								}
-							} else if(useValue){
-								if(chosenValue == clickedValue){
-									if(label.getBackground() != Color.pink){
-										selectedCards++;
-										label.setBackground(Color.pink);
-										System.out.println("Added card #" + clickedCard + "(" + intColorToText(card.getColorInt()) + ", " + card.getValue() + ")");
-									}
-								}
-							}
-						}
-					}
-					
-					@Override
-					public void mousePressed(MouseEvent e) {
-					}
-					
-					@Override
-					public void mouseExited(MouseEvent e) {
-					}
-					
-					@Override
-					public void mouseEntered(MouseEvent e) {
-					}
-					
-					@Override
-					public void mouseClicked(MouseEvent e) {
-					}
-				});
+				//JLabel curr = ((SwingPlayer) players[i]).getUiCard(j);
+				AbstractPlayer curr = players[i];
+				curr.setName(j, i + "_card" + j);
+				curr.setSize(j, 50, 50);
 			}
 			mainFrame.add(playerContainer, playerSide);
 		}
@@ -584,28 +497,6 @@
 		return (hints > 0);
 	}
 	
-	private String intColorToText(int id){
-		String color = "";
-		switch(id){
-		case 0:
-			color = "green";
-			break;
-		case 1:
-			color = "red";
-			break;
-		case 2:
-			color = "yellow";
-			break;
-		case 3:
-			color = "white";
-			break;
-		case 4:
-			color = "blue";
-			break;
-		}
-		return color;
-	}
-	
 	private void setWonOrLost(){
 		won = true;
 		lost = false;
@@ -635,12 +526,72 @@
 		return (int) (Math.random() * max);
 	}
 	
-	private void printArray(int[][] arr){
+	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--;
+	}
+	
+	/*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