diff --git a/src/server/SwingClientGame.java b/src/server/SwingClientGame.java
index f82498a..0612279 100644
--- a/src/server/SwingClientGame.java
+++ b/src/server/SwingClientGame.java
@@ -36,8 +36,11 @@
 	// Hints
 	JFrame hintFrame;
 	JLabel[] hintTypes;
+	
+	int clickedPlayer;
 
 	Font font;
+	final static Color BACKGROUND = Color.black;
 
 	public static void main(String[] args){
 		new SwingClientGame();
@@ -47,40 +50,40 @@
 		hintFrame = new JFrame("Hint UI");
 		hintFrame.setSize(450, 150);
 		hintFrame.setLayout(new GridLayout(0, 5));
-		hintFrame.getContentPane().setBackground(Color.black);
+		hintFrame.getContentPane().setBackground(BACKGROUND);
 		hintTypes = new JLabel[10];
 		hintTypes[0] = new JLabel("1", SwingConstants.CENTER);
 		hintTypes[0].setForeground(Color.white);
-		hintTypes[0].addMouseListener(new HintMouseListener(new Card(-1, 0, -1)));
+		hintTypes[0].addMouseListener(new HintMouseListener(true, 0));
 		hintTypes[1] = new JLabel("2", SwingConstants.CENTER);
 		hintTypes[1].setForeground(Color.white);
-		hintTypes[1].addMouseListener(new HintMouseListener(new Card(-1, 1, -1)));
+		hintTypes[1].addMouseListener(new HintMouseListener(true, 1));
 		hintTypes[2] = new JLabel("3", SwingConstants.CENTER);
 		hintTypes[2].setForeground(Color.white);
-		hintTypes[2].addMouseListener(new HintMouseListener(new Card(-1, 2, -1)));
+		hintTypes[2].addMouseListener(new HintMouseListener(true, 2));
 		hintTypes[3] = new JLabel("4", SwingConstants.CENTER);
 		hintTypes[3].setForeground(Color.white);
-		hintTypes[3].addMouseListener(new HintMouseListener(new Card(-1, 3, -1)));
+		hintTypes[3].addMouseListener(new HintMouseListener(true, 3));
 		hintTypes[4] = new JLabel("5", SwingConstants.CENTER);
 		hintTypes[4].setForeground(Color.white);
-		hintTypes[4].addMouseListener(new HintMouseListener(new Card(-1, 4, -1)));
+		hintTypes[4].addMouseListener(new HintMouseListener(true, 4));
 		hintTypes[5] = new JLabel("G", SwingConstants.CENTER);
 		hintTypes[5].setForeground(Color.green);
-		hintTypes[5].addMouseListener(new HintMouseListener(new Card(GREEN, -1, -1)));
+		hintTypes[5].addMouseListener(new HintMouseListener(false, GREEN));
 		hintTypes[6] = new JLabel("R", SwingConstants.CENTER);
 		hintTypes[6].setForeground(Color.red);
-		hintTypes[6].addMouseListener(new HintMouseListener(new Card(RED, -1, -1)));
+		hintTypes[6].addMouseListener(new HintMouseListener(false, RED));
 		hintTypes[7] = new JLabel("Y", SwingConstants.CENTER);
 		hintTypes[7].setForeground(Color.yellow);
-		hintTypes[7].addMouseListener(new HintMouseListener(new Card(YELLOW, -1, -1)));
+		hintTypes[7].addMouseListener(new HintMouseListener(false, YELLOW));
 		hintTypes[8] = new JLabel("W", SwingConstants.CENTER);
 		hintTypes[8].setForeground(Color.white);
-		hintTypes[8].addMouseListener(new HintMouseListener(new Card(WHITE, -1, -1)));
+		hintTypes[8].addMouseListener(new HintMouseListener(false, WHITE));
 		hintTypes[9] = new JLabel("B", SwingConstants.CENTER);
 		hintTypes[9].setForeground(Color.blue);
-		hintTypes[9].addMouseListener(new HintMouseListener(new Card(BLUE, -1, -1)));
+		hintTypes[9].addMouseListener(new HintMouseListener(false, BLUE));
 		for(int i=0; i<hintTypes.length; ++i){
-			hintTypes[i].setBackground(Color.black);
+			hintTypes[i].setBackground(BACKGROUND);
 			hintTypes[i].setFont(font);
 			hintFrame.add(hintTypes[i]);
 		}
@@ -95,25 +98,26 @@
 
 	@Override
 	protected void createUI() {
+		clickedPlayer = 0;
 		layoutConstr = new GridBagConstraints();
 		mainFrame = new JFrame("Hanabi - Player " + (ownId+1) + " (" + players[ownId].getName() + ")");
 		mainFrame.setSize(1000, 650);
 		mainFrame.setLocation(0, 0);
 		mainFrame.setLayout(new GridBagLayout());
 		mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		mainFrame.getContentPane().setBackground(Color.black);
+		mainFrame.getContentPane().setBackground(BACKGROUND);
 		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);
+		deckPanel.setBackground(BACKGROUND);
 		deckUI = new JLabel[COLORS][5];
 		for(int i=0; i<COLORS; ++i){
 			for(int j=0; j<5; ++j){
 				JLabel tmp = new JLabel("X");
-				tmp.setBackground(Color.black);
+				tmp.setBackground(BACKGROUND);
 				tmp.setForeground(Color.white);
 				tmp.setFont(font);
 				tmp.setHorizontalAlignment(JLabel.CENTER);
@@ -122,9 +126,9 @@
 			}
 		}
 		hintPanel = new JPanel();
-		hintPanel.setBackground(Color.black);
+		hintPanel.setBackground(BACKGROUND);
 		flashPanel = new JPanel();
-		flashPanel.setBackground(Color.black);
+		flashPanel.setBackground(BACKGROUND);
 		
 		//first empty cell
 		layoutConstr.gridx = 0;
@@ -255,31 +259,18 @@
 	}
 
 	@Override
-	protected void updateGame(JSONObject jo){
-		super.updateGame(jo);
-		System.out.println("SwingClientGame updateGame called");
-	}
-
-	@Override
 	protected BasePlayer createPlayer(int id, int nrOfCards, String name){
 		return new SwingPlayer(id, nrOfCards, name);
 	}
 
 	@Override
 	protected BasePlayer createPlayer(JSONObject jo){
-		System.out.println("create SwingPlayer");
 		return new SwingPlayer(jo);
 	}
 
 	@Override
 	protected void updateUI() {
-//		for(int i=0; i<playerUi.length; ++i){
-//			createCardsForPlayer(i);
-//		}
-//		mainFrame.removeAll();
-//		mainFrame.dispose();
-//		createUI();
-		// TODO
+		System.out.println("hints: " + hints);
 	}
 
 	private static Color getColor(int id){
@@ -312,66 +303,50 @@
 		public SwingPlayer(int id, int nrOfCards, String name){
 			super(id, nrOfCards, name);
 			playerUi = new JPanel();
+			playerUi.setBackground(BACKGROUND);
 			playerName = new JButton(name);
+			playerName.addMouseListener(new HintListener(id));
 			cardUi = new JLabel[nrOfCards];
+			playerUi.add(playerName);
+			for(int i=0; i<cardUi.length; ++i){
+				cardUi[i] = new JLabel();
+				cardUi[i].setFont(font);
+				cardUi[i].setBackground(BACKGROUND);
+				playerUi.add(cardUi[i]);
+			}
 		}
 
 		public SwingPlayer(JSONObject jo) {
 			super(jo);
 			playerUi = new JPanel();
-			playerUi.setBackground(Color.black);
+			playerUi.setBackground(BACKGROUND);
 			playerName = new JButton(name);
-			playerName.addMouseListener(new MouseListener() {
-				@Override
-				public void mouseReleased(MouseEvent e) {
-					if(SwingUtilities.isLeftMouseButton(e)){
-						System.out.println("Hint!");
-						toggleHintUi(e.getXOnScreen(), e.getYOnScreen());
-					}
-				}
-
-				@Override
-				public void mousePressed(MouseEvent e) {
-				}
-
-				@Override
-				public void mouseExited(MouseEvent e) {
-				}
-
-				@Override
-				public void mouseEntered(MouseEvent e) {
-				}
-
-				@Override
-				public void mouseClicked(MouseEvent e) {
-				}
-			});
+			playerName.addMouseListener(new HintListener(id));
 			playerUi.add(playerName);
 			cardUi = new JLabel[cards.length];
 			for(int i=0; i<cardUi.length; ++i){
-				final Card c = cards[i];
 				JLabel uiCard = new JLabel(String.valueOf(cards[i].getValue()));
 				uiCard.setForeground(getColor(cards[i].getColorInt()));
-				uiCard.setBackground(Color.black);
+				uiCard.setBackground(BACKGROUND);
 				uiCard.setFont(font);
-				uiCard.addMouseListener(new PlaceListener(c));
+				uiCard.addMouseListener(new PlaceListener(cards[i]));
 				cardUi[i] = uiCard;
 				playerUi.add(cardUi[i]);
-				playerUi.validate();
 			}
 		}
 
 		@Override
 		public void setCards(JSONArray ja){
 			super.setCards(ja);
-			for(int i=0; i<cardUi.length; ++i){
-				JLabel uiCard = new JLabel();
-				uiCard.setText(String.valueOf(cards[i].getValue()));
-				uiCard.setForeground(getColor(cards[i].getColorInt()));
-				uiCard.addMouseListener(new PlaceListener(cards[i]));
-				cardUi[i] = uiCard;
+			System.out.println("set Swing cards");
+			for(int i=0; i<cards.length; ++i){
+				if(cardUi[i] == null) cardUi[i] = new JLabel();
+				JLabel tmp = cardUi[i];
+				tmp.setText(String.valueOf(cards[i].getValue()));
+				tmp.setForeground(getColor(cards[i].getColorInt()));
+				tmp.addMouseListener(new PlaceListener(cards[i]));
+				cardUi[i] = tmp;
 			}
-			playerUi.validate();
 		}
 
 		public JPanel getPlayerUi(){
@@ -380,10 +355,12 @@
 	}
 
 	private class HintMouseListener implements MouseListener {
-		private Card c;
+		private boolean isValue;
+		private int value;
 
-		public HintMouseListener(Card c) {
-			this.c = c;
+		public HintMouseListener(boolean isValue, int value) {
+			this.isValue = isValue;
+			this.value = value;
 		}
 
 		@Override
@@ -401,12 +378,45 @@
 		@Override
 		public void mouseReleased(MouseEvent e) {
 			if(SwingUtilities.isLeftMouseButton(e)){
-				moveHint(c);
+				moveHint(isValue, value, clickedPlayer);
 				toggleHintUi(e.getXOnScreen(), e.getYOnScreen());
 			}
 		}
 	}
 
+	private class HintListener implements MouseListener {
+		private int playerId;
+
+		public HintListener(int playerId){
+			this.playerId = playerId;
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			if(SwingUtilities.isLeftMouseButton(e)){
+				System.out.println("Hint!");
+				clickedPlayer = playerId;
+				toggleHintUi(e.getXOnScreen(), e.getYOnScreen());
+			}
+		}
+
+		@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 class PlaceListener implements MouseListener {
 		private Card c;