diff --git a/src/main/java/com/hangman/players/YourPlayer.java b/src/main/java/com/hangman/players/YourPlayer.java
index f537169..f7d20a8 100644
--- a/src/main/java/com/hangman/players/YourPlayer.java
+++ b/src/main/java/com/hangman/players/YourPlayer.java
@@ -4,10 +4,49 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 
 public class YourPlayer implements Player {
-  @Override
-  public char GetGuess(List<Character> clue) {
-    return 'a';
-  }
+  private char guessClue;
+  private LinkedList<Character> guesses; 
+  private List<Character> latestClue; 
+
+  public YourPlayer() { 
+       this.guesses = new LinkedList<Character>(); 
+       final String commonLetter = "gturdtsake"; 
+         for (int i = 0; i < commonLetter.length(); i ++ ) 
+             guesses.add(commonLetter.charAt(i)); 
+     } 
+  
+     public YourPlayer(LinkedList<Character> guesses) { 
+         this.guesses = new LinkedList<Character>(); 
+         for (Character character : guesses) { 
+             this.guesses.add(character); 
+         } 
+     } 
+  
+     public void setGuesses(List<Character> chars) { 
+         this.guesses = new LinkedList<Character>(); 
+         for(char guess : chars) { 
+             this.guesses.add(guess); 
+         } 
+     } 
+  
+     public LinkedList<Character> getGuesses() { 
+         return guesses; 
+     } 
+  
+     public char GetGuess(List<Character> clue) { 
+         latestClue = clue; 
+         if (guesses.size() > 0  ) 
+             return guesses.pop(); 
+         return 0 ; 
+     } 
+  
+     public List<Character> getLatestClue() { 
+         return latestClue; 
+     } 
+  
+  
 }
+
diff --git a/src/test/java/com/hangman/ConsoleDisplayTest.java b/src/test/java/com/hangman/ConsoleDisplayTest.java
index 68fbd06..3d53fe1 100644
--- a/src/test/java/com/hangman/ConsoleDisplayTest.java
+++ b/src/test/java/com/hangman/ConsoleDisplayTest.java
@@ -39,7 +39,7 @@ public void OnUpdateOfGameItDisplaysCurrentClue() {
         assertEquals(expectedLines, writer.writtenLines());
     }
 
-    @Override
+    //@Override
     public boolean IsOver() {
         return false;
     }
diff --git a/src/test/java/com/hangman/players/YourPlayerTest.java b/src/test/java/com/hangman/players/YourPlayerTest.java
index bc92a3b..066fc51 100644
--- a/src/test/java/com/hangman/players/YourPlayerTest.java
+++ b/src/test/java/com/hangman/players/YourPlayerTest.java
@@ -1,16 +1,31 @@
 package com.hangman.players;
 
+import org.junit.Before;
 import org.junit.Test;
+
 import java.util.Arrays;
+import java.util.LinkedList;
+
 import static org.junit.Assert.assertEquals;
 
 public class YourPlayerTest {
-    @Test
-    public void AlwaysGuessA() {
-        YourPlayer player = new YourPlayer();
 
-        char guess = player.GetGuess(Arrays.asList('a', 'b', 'c'));
+	@Test 
+	public void alwaysGuessA() throws Exception  { 
+       YourPlayer player = new YourPlayer(); 
+       player.setGuesses(Arrays.asList('a', 'b', 'c')); 
+       char guess = player.GetGuess(Arrays.asList('a', 'b', 'c')); 
+       assertEquals('a', guess); 
+   } 
+
+ @Test 
+ public void setsAllGuessed() throws Exception { 
+     YourPlayer player = new YourPlayer(); 
+     player.setGuesses(Arrays.asList('a', 'b', 'c')); 
+     player.GetGuess(Arrays.asList('a', 'b', 'c')); 
+
+     assertEquals(Arrays.asList('a', 'b', 'c'), player.getLatestClue()); 
+ } 
+
+} 
 
-        assertEquals('a', guess);
-    }
-}