diff --git a/src/Game.java b/src/Game.java
index 6e61910..2e1a580 100644
--- a/src/Game.java
+++ b/src/Game.java
@@ -1,7 +1,6 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.Point;
 import java.awt.event.KeyEvent;
@@ -19,7 +18,6 @@
 import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.Border;
 
 
 public class Game {
@@ -51,10 +49,8 @@
 	static int[] deckCounter;
 	static ArrayList<Card> trash;
 	static Player[] players;
-	static JPanel[] playersUI;
 	static int currentPlayer;
 	static boolean won;
-	static boolean moveFinished;
 	
 	static int selectedPlayer;
 	static int selectedCards;
@@ -65,6 +61,12 @@
 	
 	//UI STUFF
 	JFrame mainFrame;
+	JPanel gamePanel;
+	JPanel hintPanel;
+	JPanel thunderPanel;
+	JLabel[] hintUI;
+	JLabel[] thunderUI;
+	static JPanel[] playersUI;
 	
 	
 	public static void main(String[] args) {
@@ -91,7 +93,6 @@
 	}
 	
 	private void resetMoveValues(){
-		moveFinished = false;
 		selectedPlayer = -1;
 		chosenColor = -1;
 		chosenValue = -1;
@@ -131,8 +132,22 @@
 		}
 	}
 	
-	private void createUI(){try {
-		UIManager.setLookAndFeel( "javax.swing.plaf.nimbus.NimbusLookAndFeel" );
+	private boolean checkValidMove(){
+		int countCards = 0;
+		for(int i=0; i<CARDS_PER_PLAYER; ++i){
+			Player 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 && hintAvailable());
+	}
+	
+	private void createUI(){
+		try {
+			UIManager.setLookAndFeel( "javax.swing.plaf.nimbus.NimbusLookAndFeel" );
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
 			e.printStackTrace();
@@ -144,13 +159,32 @@
 		mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		mainFrame.getContentPane().setBackground(Color.black);
 		mainFrame.setVisible(true);
-		/*for(int i=0; i<NR_OF_CARDS; ++i){
-			JLabel curr = new JLabel("Value: " + cards.get(i).getValue());
-			curr.setSize(50, 50);
-			curr.setBackground(cards.get(i).getColor());
-			curr.setOpaque(true);
-			mainFrame.add(curr);
-		}*/
+		gamePanel = new JPanel();
+		gamePanel.setLayout(new BoxLayout(gamePanel, BoxLayout.Y_AXIS));
+		hintPanel = new JPanel();
+		thunderPanel = new JPanel();
+		mainFrame.add(gamePanel, BorderLayout.CENTER);
+		gamePanel.add(hintPanel);
+		gamePanel.add(thunderPanel);
+		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);
+			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.cyan);
+			tmp.setName("Thunder_" + i);
+			thunderPanel.add(tmp);
+			thunderUI[i] = tmp;
+		}
+		
 		mainFrame.addKeyListener(new KeyListener(){			
 			@Override
 			public void keyTyped(KeyEvent e) {
@@ -159,7 +193,17 @@
 			
 			@Override
 			public void keyReleased(KeyEvent e) {
-				if(e.getKeyCode() == KeyEvent.VK_ENTER){
+				if(e.getKeyCode() == KeyEvent.VK_SPACE){
+					//TODO place card
+				} else if(e.getKeyCode() == KeyEvent.VK_BACK_SPACE){
+					//TODO card to trash
+				} else if(e.getKeyCode() == KeyEvent.VK_ENTER){
+					if(!checkValidMove()){
+						System.out.println("Please select all cards of the selected color/value");
+						return;
+					}
+					hintUI[hints-1].setText("0");
+					hints--;
 					//TODO get cards, reset background, update tooltips
 					JPanel playerContainer = playersUI[selectedPlayer];
 					int labels = 0;
@@ -295,6 +339,10 @@
 				curr.addMouseListener(new MouseListener() {					
 					@Override
 					public void mouseReleased(MouseEvent e) {
+						if(!hintAvailable()){
+							System.out.println("No hints left!");
+							return;
+						}
 						JLabel label = (JLabel) e.getComponent();
 						String name = label.getName();
 						int clickedPlayer = Integer.parseInt(name.substring(0, 1));
@@ -393,6 +441,10 @@
 		}
 	}
 	
+	private boolean hintAvailable(){
+		return (hints > 0);
+	}
+	
 	private Point randomPosition(){
 		Point p = new Point();
 		p.x = random(5);