diff --git a/assets/www/assign_drink.html b/assets/www/assign_drink.html
index 091b3d6..391dbbd 100644
--- a/assets/www/assign_drink.html
+++ b/assets/www/assign_drink.html
@@ -27,7 +27,7 @@ <h1>Assign Drink</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Assign Drink</h2>
-			<input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue">
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 		</div><!-- /content -->
 			
 	<div data-role="footer" class="ui-bar" data-theme="e">
diff --git a/assets/www/crayplay.js b/assets/www/crayplay.js
index 1794a79..1275fc4 100644
--- a/assets/www/crayplay.js
+++ b/assets/www/crayplay.js
@@ -23,6 +23,9 @@ var currentRound = 1;
 var currentReader = 0;
 var currentReaderName = "";
 
+var currentWinner = 0;
+var currentWinnerName = "";
+
 var nextReader = 0;
 var nextReaderName = "";
 
@@ -32,15 +35,16 @@ var currentPlayerName = "";
 var nextPlayer = 0;
 var nextPlayerName = "";
 
-var currentStage = 5;
-var maxRounds = 2;
+var currentStage = 0;
+var maxRounds = 7;
 var listCreated = true;
 var numPlayers = 3;
-
 var currentAllPlayers = new PlayerCollection();
 var currentRoundPlayers = new RoundPlayerCollection();
 var myWords = new WordCollection();
 var myDefinitions = new DefinitionCollection();
+var thePlayerAnswers = new PlayerAnswerCollection();
+var ids = [];
 
 function init(){
     document.addEventListener("deviceready", startup);
@@ -63,6 +67,28 @@ function onStartClick(){
     $.mobile.changePage("add_players.html", {transition: "none"} );
 }
 
+function onRankAnswersSubmit(){
+    var answers = $(".sub_answers");
+	ids = [];
+	
+	for(var x=0; x<answers.length; x++)
+    {
+        ids.push(answers[x].id);
+    }
+	
+	currentWinner = thePlayerAnswers.item(parseInt(ids[0])).player_id;
+	currentWinnerName = currentAllPlayers.item(currentWinner).p_name;
+	
+	for (var i = 0; i < ids.length; i++) {
+		thePlayerAnswers.setRank(parseInt(ids[i]), i+1);
+	   // Trim the excess whitespace.
+	   //ids[i] = ids[i].replace(/^\s*/, "").replace(/\s*$/, "");
+	   // Add additional code here, such as:
+	   //alert(ids[i]);
+	}
+	moveToNextPage();
+}
+
 function onRulesClick(){
     $.mobile.changePage("#rules", {transition: "none", reverse: false, changeHash: false} );
 }
@@ -100,7 +126,7 @@ function queryNewDefinition(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -116,7 +142,7 @@ function queryNewDefinition(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -138,7 +164,7 @@ function queryNewDefinition1(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -153,7 +179,7 @@ function queryNewDefinition2(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -168,7 +194,7 @@ function queryNewDefinition3(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -183,7 +209,7 @@ function queryNewDefinition4(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -198,7 +224,7 @@ function queryNewDefinition5(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewDef == false && allUsed == false)
+	while (allUsed == false && foundNewDef == false)
 	{
 		allUsed = checkForAllUsedDefs();
 	 	randomKey = Math.floor((Math.random()*myDefinitions.count)+1);
@@ -213,7 +239,7 @@ function queryNewWord(){
 	var randomKey = 0;
 	var allUsed = false;
 	
-	while (foundNewWord == false && allUsed == false)
+	while (allUsed == false && foundNewWord == false)
 	{
 		allUsed = checkForAllUsedWords();
 	 	randomKey = Math.floor((Math.random()*myWords.count)+1);
@@ -362,8 +388,6 @@ function appendToRoundOne(){
 }
 
 function appendCurrentVariables(){
-	$("#content").append("<ul id='currentvariables' data-role='listview' data-inset='true'></ul>");
-    $("#currentvariables").append("<div>");
 	//$("#currentvariables").append("<li><label for='text-basic'>currentStage: " + currentStage + "</label></li>");
 	$("#currentvariables").append("<li><center><label for='text-basic'>Round: " + currentRound + "</label></center></li>");
 	
@@ -381,33 +405,45 @@ function appendCurrentVariables(){
 			$("#currentvariables").append("</fieldset>");
 			$("#currentvariables").append("</div>");
 			//$("#currentvariables").append("<li><label for='text-basic'>currentQuestionRealText: " + currentQRealText + "</label></li>");
-			$("#content").trigger("create");
-			$("#currentvariables").listview("refresh");
-		break;
+			break;
 		case 2:
 			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentPlayerName + "</label></center></li>");
 			$("#currentvariables").append("<li><label for='text-basic'>Re-define the following word or phase:</label></li>");
 			$("#currentvariables").append("<li><center><span style='font-size:large;'>\"" + currentQText + "\"</span></center></li>");
-			$("#content").trigger("create");
-			$("#currentvariables").listview("refresh");
 			break;
 		case 3:
 			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentPlayerName + "</label></center></li>");
 			$("#currentvariables").append("<li><label for='text-basic'>Re-define the following word or phase:</label></li>");
 			$("#currentvariables").append("<li><center><span style='font-size:large;'>\"" + currentQText + "\"</span></center></li>");
-			$("#content").trigger("create");
-			$("#currentvariables").listview("refresh");
-		break;
+			break;
 		case 5:
 			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentReaderName + "</label></center></li>");
-		break;
+			break;
+		case 6:
+			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentReaderName + "</label></center></li>");
+			$("#currentvariables").append("<li><label for='text-basic'>Re-define the following word or phase:</label></li>");
+			$("#currentvariables").append("<li><center><span style='font-size:large;'>\"" + currentQText + "\"</span></center></li>");
+			break;
+		case 7:
+			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentReaderName + "</label></center></li>");
+			$("#currentvariables").append("<li><label for='text-basic'>Re-define the following word or phase:</label></li>");
+			$("#currentvariables").append("<li><center><span style='font-size:large;'>\"" + currentQText + "\"</span></center></li>");
+			break;
+		case 8:
+			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentReaderName + "</label></center></li>");
+			$("#currentvariables").append("<li><label for='text-basic'>Re-define the following word or phase:</label></li>");
+			$("#currentvariables").append("<li><center><span style='font-size:large;'>\"" + currentQText + "\"</span></center></li>");
+			break;
+		case 9:
+			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentWinnerName + "</label></center></li>");
+			$("#currentvariables").append("<li><label for='text-basic'>Re-define the following word or phase:</label></li>");
+			$("#currentvariables").append("<li><center><span style='font-size:large;'>\"" + currentQText + "\"</span></center></li>");
+			break;
 		default:
 			//$("#currentvariables").append("<li><label for='text-basic'>currentReader: " + currentReader + " name: " + currentReaderName + "</label></li>");
 			$("#currentvariables").append("<li><center><label for='text-basic'>" + currentPlayerName + "</label></center></li>");
 		break;
 	}
-	$("#currentvariables").append("</div>");
-	$("#content").trigger("create");
 	$("#currentvariables").listview("refresh");
 	
 	//BODY
@@ -420,9 +456,9 @@ function appendCurrentVariables(){
 			$("#currentvariables").append("<li><center><label for='text-basic'>"+currentPlayerName+"</label></center></li>");
 			$("#currentvariables").append("</div>");
 			$("#currentvariables").append("</fieldset>");
-			$("#currentvariables").append("<input type='button' id='submitDefinition' onClick='moveToNextPage()' value='"+currentPlayerName+" - Click to Continue'/>");
-			$("#content").trigger("create");
 			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='submitDefinition' onClick='moveToNextPage()' value='"+currentPlayerName+" - Click to Continue'/>");
+			$("#content").trigger("create");
 		break;
 		case 2:
 			$("#currentvariables").append("<div data-role='fieldcontain'>");
@@ -437,10 +473,10 @@ function appendCurrentVariables(){
 			$("#currentvariables").append("</div>");
 			$("#currentvariables").append("</fieldset>");
 			$("#currentvariables").append("</div>");
-			
-			$("#currentvariables").append("<input type='button' id='submitDefinition' onClick='onReceviedDefinition()' value='Submit'/>");
-			$("#content").trigger("create");
 			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='submitDefinition' onClick='onReceviedDefinition()' value='Submit'/>");
+			$("#content").trigger("create");
+
 		break;
 		case 3:
 			$("#currentvariables").append("<li><label for='text-basic'><center>Definition recieved!</label></center></li>");
@@ -450,9 +486,10 @@ function appendCurrentVariables(){
 			$("#currentvariables").append("<li><center><label for='text-basic'>"+nextPlayerName+"</label></center></li>");
 			$("#currentvariables").append("</div>");
 			$("#currentvariables").append("</fieldset>");
-			$("#currentvariables").append("<input type='button' id='submitDefinition' onClick='moveToNextPage()' value='"+nextPlayerName+" - Click to Continue'/>");
-			$("#content").trigger("create");
 			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='submitDefinition' onClick='moveToNextPage()' value='"+nextPlayerName+" - Click to Continue'/>");
+			$("#content").trigger("create");
+
 		break;
 		case 4:
 			$("#currentvariables").append("<li><label for='text-basic'><center>Definition recieved!</label></center></li>");
@@ -463,50 +500,81 @@ function appendCurrentVariables(){
 			$("#currentvariables").append("<li><center><label for='text-basic'>"+currentReaderName+"</label></center></li>");
 			$("#currentvariables").append("</div>");
 			$("#currentvariables").append("</fieldset>");
-			$("#currentvariables").append("<input type='button' id='submitDefinition' onClick='moveToNextPage()' value='"+currentReaderName+" - Click to Continue'/>");
-			$("#content").trigger("create");
 			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='submitDefinition' onClick='moveToNextPage()' value='"+currentReaderName+" - Click to Continue'/>");
+			$("#content").trigger("create");
 		break;
 		case 5:
 			$("#currentvariables").append("<li><label for='text-basic'><center>Rank Definitions</label></center></li>");
-			$("#currentvariables").append("<div data-role='fieldcontain'>");
-			$("#currentvariables").append("<fieldset data-role='controlgroup'>");	
-			$("#currentvariables").append("<legend>Drag the definitions below to change their ranks.  Your most favourite definition is at the bottom</legend>");
-			$("#currentvariables").append("<ul data-role='listview' id='sortable' data-divider-theme='b' data-inset='true'>");
-            $("#currentvariables").append("<li data-role='list-divider' role='heading'>Re-order</li>");
-            $("#currentvariables").append("<li data-theme='c'>1</li>");
-            $("#currentvariables").append("<li data-theme='c'>2</li>");
-            $("#currentvariables").append("<li data-theme='c'>3</li>");
-            $("#currentvariables").append("<li data-theme='c'>4</li>");
-            $("#currentvariables").append("<li data-theme='c'>5</li>");
-            $("#currentvariables").append("<li data-theme='c'>6</li>");
-            $("#currentvariables").append("<li data-theme='c'>7</li>");
 			$("#currentvariables").append("</ul>");
-			$("#currentvariables").append("</div>");
-			$("#currentvariables").append("</fieldset>");
-			$("#currentvariables").append("<input type='button' id='submitDefinition' onClick='onRankAnswersSubmit()' value='Submit'/>");
-			$("#content").trigger("create");
+			$("#currentvariables").append("<legend>Drag the definitions below to change their ranks.  Your most favourite definition is at the top</legend>");
 			$("#currentvariables").listview("refresh");
+			$("#sortable").append("<li data-role='list-divider'>Answers</li>");
+			thePlayerAnswers.forEach(
+			function(d_id, w_id, p_id, r_id, d_v_count, d_rank)
+			{
+				if(r_id == currentRound)
+				{
+					$("#sortable").append("<li data-theme='c' class='sub_answers' id="+d_id+">"+myDefinitions.item(d_id).def_text+"<input type='text'/></li>");
+				}
+			});
+			$("#sortable").listview("refresh");
+			$("#content").append("<input type='button' id='submitDefinition' onClick='onRankAnswersSubmit()' value='Submit'/>");
+			$("#content").trigger("create");
 		break;
-		default:
+		case 6:
+			$("#currentvariables").append("<li><label for='text-basic'><center>Read Definitions</label></center></li>");
+			$("#currentvariables").append("<legend>Read the re-definitions below out loud, ordered by favourite to least favourite</legend>");
+			$("#currentvariables").append("<li data-role='list-divider'>Answers</li>");
+			for (var i = 0; i < ids.length; i++) 
+			{
+				//alert(ids[i]);
+				$("#currentvariables").append("<li data-theme='c' class='ranked_answers'>"+ myDefinitions.item(parseInt(ids[i])).def_text + "</li>");
+			}
+			$("#currentvariables").append("</ul>");
+			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='continueButton' onClick='moveToNextPage()' value='Continue'/>");
+			$("#content").trigger("create");
+			break;
+		case 7:	
 			$("#currentvariables").append("<div data-role='fieldcontain'>");
 			$("#currentvariables").append("<fieldset data-role='controlgroup'>");	
-			$("#currentvariables").append("<legend>Definitions</legend>");	
-			$("#currentvariables").append("<div id='radio'>");
-			$("#currentvariables").append("<input name='definition' id='radio1' value='" + currentDef1ID + "' type='radio'><label for='radio1'>"+currentDef1Text+"</label>");
-			$("#currentvariables").append("<input name='definition' id='radio2' value='" + currentDef2ID + "' type='radio'><label for='radio2'>"+currentDef2Text+"</label>");
-			$("#currentvariables").append("<input name='definition' id='radio3' value='" + currentDef3ID + "' type='radio'><label for='radio3'>"+currentDef3Text+"</label>");
-			$("#currentvariables").append("<input name='definition' id='radio4' value='" + currentDef4ID + "' type='radio'><label for='radio4'>"+currentDef4Text+"</label>");
-			$("#currentvariables").append("<input name='definition' id='radio5' value='" + currentDef5ID + "' type='radio'><label for='radio5'>"+currentDef5Text+"</label>");
-			$("#currentvariables").append("</div>");
+			$("#currentvariables").append("<legend>Read the real definition out loud, if the other players are interested:</legend>");
+			$("#currentvariables").append("<li><center>"+currentQRealText+"</center></li>");
 			$("#currentvariables").append("</fieldset>");
 			$("#currentvariables").append("</div>");
+			$("#currentvariables").append("</ul>");
+			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='continueButton' onClick='moveToNextPage()' value='Continue'/>");
 			$("#content").trigger("create");
+			break;
+		case 8:
+			$("#currentvariables").append("<legend>Winner for the round is:</legend>");
+			$("#currentvariables").append("<li><center>"+currentWinnerName+"</center></li>");
+			$("#currentvariables").append("</ul>");
 			$("#currentvariables").listview("refresh");
-			
-			$("#currentvariables").append("<input type='button' id='submitDefinition' onClick='onReceviedDefinition()' value='Submit'/>");
+			$("#content").append("<input type='button' id='continueButton' onClick='moveToNextPage()' value='"+currentWinnerName+" - Click to Continue'/>");
 			$("#content").trigger("create");
+			break;
+		case 9:
+			$("#currentvariables").append("<legend>Assign a drink:</legend>");
+			$("#currentvariables").append("<li><center>Choose which player takes a drink</center></li>");
+			$("#currentvariables").append("<div id='radio'>");
+			currentAllPlayers.forEach(
+			function(p_id, p_name)
+			{
+				if(p_id != currentWinner)
+				{
+					$("#currentvariables").append("<input name='playerdrink' id='"+p_id+"' value='" + p_name + "' type='radio'><label for='"+p_id+"'>"+p_name+"</label>");
+				}
+			});
+			$("#currentvariables").append("</div>");
+			$("#currentvariables").append("</ul>");
 			$("#currentvariables").listview("refresh");
+			$("#content").append("<input type='button' id='continueButton' onClick='moveToNextPage()' value='Continue'/>");
+			$("#content").trigger("create");
+			break;
+		default:
 		break;
 	}
 }
diff --git a/assets/www/crayplaydb.js b/assets/www/crayplaydb.js
index df57dfc..c238746 100644
--- a/assets/www/crayplaydb.js
+++ b/assets/www/crayplaydb.js
@@ -14,7 +14,7 @@ function populateDB(tx){
      tx.executeSql('CREATE TABLE IF NOT EXISTS PLAYERS (p_id INTEGER PRIMARY KEY AUTOINCREMENT, p_name TEXT)');
      tx.executeSql('CREATE TABLE IF NOT EXISTS GAMELOG (g_id INTEGER PRIMARY KEY AUTOINCREMENT, p_winner INTEGER, played_date DATE)');
      tx.executeSql('CREATE TABLE IF NOT EXISTS GAMETRANLOG (gt_id INTEGER PRIMARY KEY AUTOINCREMENT, g_id INTEGER, p_id INTEGER, def_id INTEGER, def_used_ind INTEGER)');
-   	 tx.executeSql('CREATE TABLE IF NOT EXISTS PLAYERANSWERS (pa_id INTEGER PRIMARY KEY AUTOINCREMENT, g_id INTEGER, p_id INTEGER, word_id, round_id INTEGER, def_id INTEGER, a_vote_count INTEGER, a_rank INTEGER)');
+   	 tx.executeSql('CREATE TABLE IF NOT EXISTS PLAYERANSWERS (pa_id INTEGER PRIMARY KEY AUTOINCREMENT, g_id INTEGER, p_id INTEGER, word_id INTEGER, round_id INTEGER, def_id INTEGER, a_vote_count INTEGER, a_rank INTEGER)');
    	 tx.executeSql('CREATE TABLE IF NOT EXISTS DEFINITIONS (def_id INTEGER KEY UNIQUE, def_type INTEGER, def_text TEXT)');
    	 tx.executeSql('CREATE TABLE IF NOT EXISTS SETUPPARAMS (setup_id INTEGER KEY UNIQUE, setup_text TEXT, setup_value TEXT)');
    	 
@@ -61,16 +61,6 @@ function populateDB(tx){
 	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (18, 1, "Definition 18")');
 	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (19, 1, "Definition 19")');
 	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (20, 1, "Definition 20")');	 	 
-	 /*tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (21, 1, "Definition 21")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (22, 1, "Definition 22")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (23, 1, "Definition 23")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (24, 1, "Definition 24")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (25, 1, "Definition 25")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (26, 1, "Definition 26")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (27, 1, "Definition 27")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (28, 1, "Definition 28")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (29, 1, "Definition 29")');
-	 tx.executeSql('INSERT INTO DEFINITIONS (def_id, def_type, def_text) VALUES (30, 1, "Definition 30")'); 	 */
 	 
 	 //CREATE SETUP PARAMETERS       	 
    	 tx.executeSql('INSERT INTO SETUPPARAMS (setup_id, setup_text, setup_value) VALUES (1, "handsize", "5")');
@@ -204,9 +194,11 @@ function addPlayerAnswerDB(errorCallBack, successCallBack){
 }
 function addPlayerAnswerDBCall(tx){
 	var setPlayerName="";
-	//alert(numPlayers);
-	var a_def_id = $("input:radio:checked").val();
+	var a_def_id = 	$('input[name="definition"]:checked').val();//$("input:radio:checked").val();
+	//alert(a_def_id);
+	//alert(currentPlayer);
 	tx.executeSql('INSERT INTO PLAYERANSWERS(g_id,p_id,word_id,def_id,a_vote_count,a_rank) VALUES (?,?,?,?,?,?)', [currentGameID, currentPlayer, currentQID, a_def_id, 0,0], successCB, errorCB);
+	thePlayerAnswers.add(a_def_id, currentQID, currentPlayer, currentRound, currentGameID, 0, 0);
 }	
 function addPlayerAnswerDBSuccess(){
   	//alert('inside add player answer success db');
@@ -220,9 +212,7 @@ function getPlayerAnswerDBCall(tx){
     tx.executeSql('SELECT def_id, p_id from PLAYERANSWERS WHERE g_id = ? and word_id = ? and p_id = ?', [currentPlayer, currentQID, currentGameID], getDBPlayerAnswerDBSuccess, errorCB);
 }	
 function getDBPlayerAnswerDBSuccess(tx, results) {
-    //alert("inside queryDBPlayersDBSuccess");
     for(var i=0; i<results.rows.length;i++){
-		//alert(results.rows.item(i).def_id);
-		//alert(results.rows.item(i).p_id);
+		//thePlayerAnswers.add(results.rows.item(i).p_id, currentQID, results.rows.item(i).def_id, currentGameID, currentRound, 0, 0);
     }
 }
\ No newline at end of file
diff --git a/assets/www/crayplaystructures.js b/assets/www/crayplaystructures.js
index c69748b..2992236 100644
--- a/assets/www/crayplaystructures.js
+++ b/assets/www/crayplaystructures.js
@@ -66,7 +66,7 @@ var PlayerCollection=function()
 		{
 			if(this.collection.hasOwnProperty(key))
 			{
-				block(key, this.collection[key]);
+				block(key, this.collection[key].p_name);
 			}
 		}
 	 }
@@ -235,7 +235,7 @@ var WordCollection=function()
 				block(key, this.collection[key].word_text, this.collection[key].word_realdef, this.collection[key].used_ind);
 			}
 		}
-	 }
+	}
 }
 
 var DefinitionCollection=function()
@@ -269,7 +269,7 @@ var DefinitionCollection=function()
 	{
 	 	return this.collection[key];
 	}
-	
+
 	this.forEach=function(block)
 	{
 		for(key in this.collection) 
@@ -280,4 +280,62 @@ var DefinitionCollection=function()
 			}
 		}
 	 }
+}
+
+var PlayerAnswerCollection=function()
+{
+	this.count=0;
+	this.collection={};
+
+	this.add=function(key, w_id, p_id, r_id, g_id, d_v_count, d_rank )
+	{
+		if(this.collection[key]!=undefined)
+			return undefined;
+			
+		this.collection[key] =	{
+									def_id: key,
+									word_id: w_id,
+									player_id: p_id,
+									round_id: r_id,
+									game_id: g_id,
+									def_vote_count: d_v_count,
+									def_rank: d_rank
+								};
+		return ++this.count;
+	}
+
+	this.remove=function(key)
+	{
+		 if(this.collection[key]==undefined)
+			return undefined;
+		 delete this.collection[key];
+		 return --this.count;
+	}
+	
+	this.item=function(key)
+	{
+	 	return this.collection[key];
+	}
+	
+	this.setRank=function(key, rank)
+	{
+		if(this.collection[key]!=undefined)
+		return undefined;
+			
+	 	this.collection[key].def_rank = rank;
+		
+		return this.collection[key].def_rank;
+	}
+	
+	this.forEach=function(block)
+	{
+		for(key in this.collection) 
+		{
+			if(this.collection.hasOwnProperty(key))
+			{
+				block(key, this.collection[key].word_id, this.collection[key].player_id, this.collection[key].round_id, this.collection[key].def_vote_count, 
+				this.collection[key].def_rank);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/assets/www/index.html b/assets/www/index.html
index b0cf9dd..8ea2267 100644
--- a/assets/www/index.html
+++ b/assets/www/index.html
@@ -5,13 +5,25 @@
     <meta name="viewport" content="width=320; user-scalable=no" />
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>CrayPlay</title>
+	<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" href="http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.css" />
     <script type="text/javascript" charset="utf-8" src="js/phonegap-1.3.0.js"></script>
 	<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
+	<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 	<script src="http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js"></script>
 	<script type="text/javascript" charset="utf-8" src="crayplaystructures.js"></script>
 	<script type="text/javascript" charset="utf-8" src="crayplay.js"></script>
 	<script type="text/javascript" charset="utf-8" src="crayplaydb.js"></script>
+	<script>
+	$('#rank_answers').bind('pageinit', function() {
+	$( "#sortable" ).sortable();
+	$( "#sortable" ).disableSelection();
+	<!-- Refresh list to the end of sort to have a correct display -->
+	$( "#sortable" ).bind( "sortstop", function(event, ui) {
+	  $('#sortable').listview('refresh');
+	});
+	});
+	</script>
     </head>
 
     <body onload="init()">
diff --git a/assets/www/rank_answers.html b/assets/www/rank_answers.html
index 8d94329..30f764c 100644
--- a/assets/www/rank_answers.html
+++ b/assets/www/rank_answers.html
@@ -4,44 +4,79 @@
     <meta name="viewport" content="width=320; user-scalable=no" />
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>Rank Answers</title>
+	<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" href="http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.css" />
     <script type="text/javascript" charset="utf-8" src="js/phonegap-1.3.0.js"></script>
 	<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
+	<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 	<script src="http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js"></script>
-
 	</head>
 <body>
-
 <div data-role="page" id="rank_answers">
 <script>
 $('#rank_answers').bind('pageshow', function(){
 	//alert("inside select_definition pageshow");
 	resetPageVariables(5);
 	grabCurrentVariables();
-	
-	$('ul')
-	.addClass('ui-corner-top')
-	.removeClass('ui-corner-all')
-	.sortable({
-		'containment': 'parent',
-		'opacity': 0.6,
-		update: function(event, ui) {
-			alert("dropped");
-		}
+	/*
+	$( "#sortable" ).sortable();
+	$( "#sortable" ).disableSelection();
+	<!-- Refresh list to the end of sort to have a correct display -->
+	$( "#sortable" ).bind( "sortstop", function(event, ui) {
+	  $('#sortable').listview('refresh');
 	});
-		
+	*/
+	
+sort_ul = $('#sortable');
+itemsCount = $('#sortable li').length;
+
+function updateIndexes(){
+    $('li input').each(function(i){
+              $(this).val(i+1);
+          });
+}
+
+updateIndexes();
+
+$('#sortable li').removeClass('ui-corner-bottom');
+
+sort_ul.sortable({
+       items: "li:not(.ui-li-divider)"
 });
-</script>
-<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-<script>
-$(document).bind('pageinit', function() {
-$( "#sortable" ).sortable();
-$( "#sortable" ).disableSelection();
-<!-- Refresh list to the end of sort to have a correct display -->
-$( "#sortable" ).bind( "sortstop", function(event, ui) {
-  $('#sortable').listview('refresh');
+
+sort_ul.disableSelection();
+
+sort_ul.bind( "sortstop", function(event, ui) {
+updateIndexes();
+});
+	
+$('li input').keyup(function(event) {
+  if(event.keyCode == '13'){      
+    event.preventDefault();
+      
+    order = parseInt($(this).val());
+      
+    li = $(this).parent();
+    if(order>=1 && order <= itemsCount){      
+        
+        li.effect('drop', function(){
+            li.detach();
+                
+            if(order == itemsCount)
+                sort_ul.append(li);
+            else
+                li.insertBefore($('#sortable li:eq('+(order-1)+')'));
+            
+            updateIndexes();
+            li.effect('slide');
+        });
+    }else{
+        li.effect('highlight');
+    }
+  }    
 });
 });
+
 </script>
 		<div data-role="header" data-theme="e">
 			<a data-role="button" data-rel="back" data-mini="true">Back</a></h3>
@@ -50,15 +85,9 @@ <h1>Rank Answers</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Rank Answers</h2>
-		<ul data-role="listview" data-inset="true" data-theme="d" id="sortable">
-		<li data-role="list-divider">List</li>
-		<li>Item 1</li>
-		<li>Item 2</li>
-		<li>Item 3</li>
-		<li>Item 4</li>
-		<li>Item 5</li>
-		</ul>
-			<!-- <input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue"> -->
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
+			
+			<ul data-role="listview" data-divider-theme="b" data-inset="true" id="sortable"></ul>
 		</div><!-- /content -->
 			
 	<div data-role="footer" class="ui-bar" data-theme="e">
diff --git a/assets/www/read_answers.html b/assets/www/read_answers.html
index 3d6a712..093532e 100644
--- a/assets/www/read_answers.html
+++ b/assets/www/read_answers.html
@@ -27,7 +27,7 @@ <h1>Read Answers</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Read Answers</h2>
-			<input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue">
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 		</div><!-- /content -->
 			
 	<div data-role="footer" class="ui-bar" data-theme="e">
diff --git a/assets/www/read_new_word.html b/assets/www/read_new_word.html
index 547c580..8de7086 100644
--- a/assets/www/read_new_word.html
+++ b/assets/www/read_new_word.html
@@ -27,7 +27,7 @@ <h1>Read New Word</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Read New Word</h2>
-			<!-- / button -- <input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue"> -->
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 		</div><!-- /content -->
 			
 	<div data-role="footer" class="ui-bar" data-theme="e">
diff --git a/assets/www/read_real_def.html b/assets/www/read_real_def.html
index 7e5bc1f..72f9dbd 100644
--- a/assets/www/read_real_def.html
+++ b/assets/www/read_real_def.html
@@ -27,7 +27,7 @@ <h1>Read Real Definition</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Read Real Definition</h2>
-			<input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue">
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 		</div><!-- /content -->
 			
 	<div data-role="footer" class="ui-bar" data-theme="e">
diff --git a/assets/www/read_winner.html b/assets/www/read_winner.html
index 699156e..c4eeed7 100644
--- a/assets/www/read_winner.html
+++ b/assets/www/read_winner.html
@@ -27,7 +27,7 @@ <h1>Read Winner</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Read Winner</h2>
-			<input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue">
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 		</div><!-- /content -->
 			
 	<div data-role="footer" class="ui-bar" data-theme="e">
diff --git a/assets/www/select_definition.html b/assets/www/select_definition.html
index 0ff120d..d632485 100644
--- a/assets/www/select_definition.html
+++ b/assets/www/select_definition.html
@@ -27,6 +27,7 @@ <h1>Select Definition</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Select Definition</h2>
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 			<!-- /content -- <input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue"> -->
 		</div><!-- /content -->
 			
diff --git a/assets/www/verify_def.html b/assets/www/verify_def.html
index 283eced..701db6d 100644
--- a/assets/www/verify_def.html
+++ b/assets/www/verify_def.html
@@ -8,7 +8,7 @@
     <script type="text/javascript" charset="utf-8" src="js/phonegap-1.3.0.js"></script>
 	<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
 	<script src="http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js"></script>
-
+	<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 	</head>
 <body>
 
@@ -27,6 +27,7 @@ <h1>Verify Definition</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Verify Definition</h2>
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 			<!-- <input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="Player - Click To Continue"> -->
 		</div><!-- /content -->
 			
diff --git a/assets/www/verify_def_last_player.html b/assets/www/verify_def_last_player.html
index 2c92e3e..65449e9 100644
--- a/assets/www/verify_def_last_player.html
+++ b/assets/www/verify_def_last_player.html
@@ -8,7 +8,7 @@
     <script type="text/javascript" charset="utf-8" src="js/phonegap-1.3.0.js"></script>
 	<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
 	<script src="http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js"></script>
-
+	<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 	</head>
 <body>
 
@@ -27,6 +27,7 @@ <h1>Verify Definition Last Player</h1>
 
 		<div data-role="content" id="content" data-theme="e">
 			<h2>Verify Definition  Last Player</h2>
+			<ul id='currentvariables' data-role='listview' data-inset='true'></ul>
 			<!-- <input type="button" id="clicktoContinue" onClick="moveToNextPage()" value="All Answers Received - Click To Continue"> -->
 		</div><!-- /content -->