diff --git a/index.html b/index.html
index 6ca83e8..60c8800 100644
--- a/index.html
+++ b/index.html
@@ -17,8 +17,15 @@
     <h1>Hangman 2020 av Rolf Martin Glomsrud</h1>
     <canvas id="myCanvas"></canvas>
     <div>
-        <input type="text" id="myText", value="">
-        <input type="button" id="testKnapp" width="40px" height="40px" value="Test!" onclick="testLetter()">
+      <h2>Gjett bokstaver</h2>
+      <input type="text" id="myText" value="" onkeyup="if(event.keyCode===13) {event.preventDefault(); sjekkBokstav();}">
+      <input type="button" id="testKnapp" width="40px" height="40px" value="Test!" onclick="sjekkBokstav()">
+    </div>
+    
+    <div>
+      <h2>Gjett ord</h2>
+      <input type="text" id="myTextWord" onkeyup="if(event.keyCode===13) {event.preventDefault(); sjekkOrd();}">
+      <input type="button" id="testOrdKnapp" width="40px" height="40px" value="Test ord!" onclick="sjekkOrd()">
     </div>
     <h2>Feil:</h2>
     <p id="wrongLetters"></p>
@@ -27,14 +34,8 @@
     
     <h2>Ordet så langt:</h2>
     <p id="ord"></p>
-        
-
-
-
-
-
-
-
     <script src="script.js"></script>
+
+    <h2 id="result"></h2>
 </body>
 </html>
\ No newline at end of file
diff --git a/script.js b/script.js
index 43eb18a..69bdace 100644
--- a/script.js
+++ b/script.js
@@ -2,12 +2,14 @@ var screenWidth = screen.width;
 var screenHeight = screen.height;
 var partsTracker = 0
 
-var tries = 8;
+var guessed = [];
+var tries = 9;
 var word = "babaganoush";
 var arrayWord = word.split("");
 var whatTheUserSees = [];
 var feil = [];
 
+
 for (i=0; i < arrayWord.length; i++){
     whatTheUserSees.push("_");
 }
@@ -16,26 +18,77 @@ var whatTheUserSeesWord = whatTheUserSees.join("");
 document.getElementById("ord").innerHTML = whatTheUserSeesWord;
 get("tries").innerHTML = tries;
 
-function testLetter(){
-    var guess = get("myText").value;
-    if (arrayWord.includes(guess)){
-        for (i=0; i < arrayWord.length; i++){
-            if (guess == arrayWord[i]){
-                whatTheUserSees[i] = guess;
-            }
-        }
+
+function sjekkOrd(){
+    var guessOrd = get("myTextWord").value;
+    get("myTextWord").innerHTML = "";
+    if (guessOrd == get("ord").innerHTML){
+        alert("Spillet er over")
+    }else if(guessed.includes(guessOrd)){
+        alert("Du har allerede gjettet det ordet!")
     }else{
-        console.log(guess);
-        tries -= 1;
-        feil.push(guess);
-        var earlier = get("wrongLetters").innerHTML;
-        var nyInner = earlier + " " + guess;
-        get("wrongLetters").innerHTML = nyInner;
-        get("tries").innerHTML = tries;
-        draw();
+        testWord();
     }
-    var whatTheUserSeesWord = whatTheUserSees.join("");
-    document.getElementById("ord").innerHTML = whatTheUserSeesWord;
+}
+
+function testWord(){
+    if (tries <= 0){
+        alert("Spillet er ferdig, venligst restart siden for å prøve igjen");
+        get("myText").value = "";
+    }else{
+        var guessedWord = get("myTextWord").value;
+        guessed.push(guessedWord);
+        if (word == guessedWord){
+            get("result").innerHTML = "Gratulerer, du gjettet ordet!";
+            get("ord").innerHTML = word;
+        }
+    }
+}
+
+function sjekkBokstav(){
+    var guess = get("myText").value;
+    console.log(guess);
+    if (guessed.includes(guess)){
+        alert("Du har allerede gjettet den bokstaven, venligst gjett en ny!");
+    }else{
+        testLetter();
+    }
+}
+
+function testLetter(){
+    
+    if (tries <= 0 || get("ord").innerHTML == word){
+        alert("Spillet er ferdig, venligst restart siden for å prøve igjen");
+        get("myText").value = "";
+    }else{
+        console.log(guessed);
+        var guess = get("myText").value;
+        guessed.push(guess);
+        if (arrayWord.includes(guess)){
+            for (i=0; i < arrayWord.length; i++){
+                if (guess == arrayWord[i]){
+                    whatTheUserSees[i] = guess;
+                }
+            }
+        }else{
+            tries -= 1;
+            feil.push(guess);
+            var earlier = get("wrongLetters").innerHTML;
+            var nyInner = earlier + " " + guess;
+            get("wrongLetters").innerHTML = nyInner;
+            get("tries").innerHTML = tries;
+            draw();
+        }
+        var whatTheUserSeesWord = whatTheUserSees.join("");
+        document.getElementById("ord").innerHTML = whatTheUserSeesWord;
+        if (tries == 0){
+            get("result").innerHTML = "Beklager, du tapte";
+        }else if(whatTheUserSeesWord == word){
+            get("result").innerHTML = "Gratulerer, du gjettet ordet!";
+        }
+        get("myText").value = "";
+    }
+    
 
 }