diff --git a/src/kode/Tournament.cpp b/src/kode/Tournament.cpp
index 742fb439511c4900e40aac86e22a26a5e42cc649..932e8603948fa2133fdeb8bc7b1dc6fb416f6cb7 100644
--- a/src/kode/Tournament.cpp
+++ b/src/kode/Tournament.cpp
@@ -49,9 +49,47 @@ void Tournament::startNewTournament()
 
 void Tournament::enterResults()
 {
+    cout << endl << "Enter results for round " << currentRound;
     for (int i = 0; i < nrOfTables; ++i)
     {
+        int answer;
+        cout << endl << "Enter results for table " << i << "with "
+        << playerList[searchByID(white[i],1)]->lastName
+        << " as white and "
+        << playerList[searchByID(black[i],1)]->lastName
+        << " as black."
+        << endl << "1: white victory"
+        << endl << "2: black victory"
+        << endl << "3: draw";
+        answer = lesInt("\nResult: ",1,3);
+        switch (answer)
+        {
+            case 1:
+                playerList[searchByID(white[i],1)]->results.push_back(2);
+                playerList[searchByID(black[i],1)]->results.push_back(0);
+                break;
+            case 2:
+                playerList[searchByID(white[i],1)]->results.push_back(0);
+                playerList[searchByID(black[i],1)]->results.push_back(2);
+                break;
+            case 3:
+                playerList[searchByID(white[i],1)]->results.push_back(1);
+                playerList[searchByID(black[i],1)]->results.push_back(1);
+                break;
+            default:
+                cout << "Error!";
+                break;
+        }
+    }
+    sortRanking();
 
+    if(currentRound == nrOfRounds)
+    {
+        endTournament();
+    }
+    else
+    {
+        printTables();
     }
 }
 
@@ -171,7 +209,8 @@ bool Tournament::canStartRound()
 
 void Tournament::endTournament()
 {
-
+    cout << endl << endl << "The tournament is finished! Here are the final rankings:";
+    printRanking();
 }
 
 /**
diff --git a/src/kode/Tournament.h b/src/kode/Tournament.h
index fa0b3d75d62c0d2f01efb97b4256ed8a2d7de9af..03fe46b1056fd81b17b1d4438c562562d68a7c8a 100644
--- a/src/kode/Tournament.h
+++ b/src/kode/Tournament.h
@@ -29,8 +29,8 @@ class Tournament
         vector<int>black;
 
         virtual void startNewTournament(); //+
-        virtual void enterResults(); //-
-        virtual void endTournament(); //-
+        virtual void enterResults(); //+
+        virtual void endTournament(); //+
         virtual void printTables(); //+
         virtual void createMatchups();//+
         bool canStartRound();//+