diff --git a/src/player/BasePlayer.java b/src/player/BasePlayer.java
index 93834fb..5803ead 100644
--- a/src/player/BasePlayer.java
+++ b/src/player/BasePlayer.java
@@ -25,14 +25,22 @@
 	
 	public BasePlayer(JSONObject jo){
 		this();
-		cards = new Card[jo.getJSONArray("cards").length()];
 		fromJson(jo);
 	}
 	
 	private BasePlayer() {
 		PROTO = PROTOCOL.VIBE_DUMB;
 	}
-	
+
+	public void setCards(JSONArray ja){
+		cards = new Card[ja.length()];
+		for(int i=0; i<ja.length(); ++i){
+			JSONObject card = ja.getJSONObject(i);
+			Card c = new Card(card);
+			cards[i] = c;
+		}
+	}
+
 	public void setCard(int index, Card c){
 		cards[index] = c;
 	}
@@ -40,11 +48,15 @@
 	public Card getCard(int index){
 		return cards[index];
 	}
-	
+
 	public Card[] getCards(){
 		return cards;
 	}
-	
+
+	public String getName(){
+		return name;
+	}
+
 	public JSONObject toJson(){
 		JSONObject root = new JSONObject();
 		root.put("name", name);
@@ -64,12 +76,7 @@
 	private void fromJson(JSONObject jo){
 		int id = jo.getInt("id");
 		String name = jo.getString("name");
-		JSONArray cardsArray = jo.getJSONArray("cards");
-		for(int i=0; i<cardsArray.length(); ++i){
-			JSONObject card = cardsArray.getJSONObject(i);
-			Card c = new Card(card);
-			cards[i] = c;
-		}
+		setCards(jo.getJSONArray("cards"));
 		this.id = id;
 		this.name = name;
 	}