diff --git a/app/model/Teamtable.php b/app/model/Teamtable.php
index 7e11af4..7160ff9 100644
--- a/app/model/Teamtable.php
+++ b/app/model/Teamtable.php
@@ -28,14 +28,23 @@ class Teamtable
         return $sth->fetch(PDO::FETCH_ASSOC);
     }
 
-    public function updateTeamByID(int $id, array $params): void
+    // why this is so long who cares???
+    public function updateTeamByID(
+        int $id,
+        string $LagNavn,
+        string $Bedrift,
+        string $Kortnummer,
+        string $Lagleder,
+        int $Telefon,
+        string $Deltagere,
+        int $Runder
+    ): void
     {
-        // todo ...
-        $sth = $this->dbh->prepare('UPDATE lagtabell SET  WHERE LagID = ?');
-        $sth->execute([$params]);       
+        $sth = $this->dbh->prepare('UPDATE lagtabell SET LagNavn = ?, Bedrift = ?, Kortnummer = ?, Lagleder = ?, Telefon = ?, Deltagere = ?, Runder = ? WHERE LagID = ?');
+        $sth->execute([$LagNavn, $Bedrift, $Kortnummer, $Lagleder, $Telefon, $Deltagere, $Runder, $id]);
     }
 
-    public function addTeam(int $id, array $params): void
+    public function addTeam(): int
     {
         // todo ...
     }
diff --git a/app/view/pages/simulator.php b/app/view/pages/simulator.php
index 573ca4f..a61f735 100644
--- a/app/view/pages/simulator.php
+++ b/app/view/pages/simulator.php
@@ -1,7 +1,7 @@
 <h1>Simulator</h1>
 <p>Skriv inn et kortnummer:</p>
 <form method="post" autocomplete="off">
-    <input type="text" name="cardnumber">
+    <input type="text" name="cardnumber" maxlength="32">
     <br>
     <br>
     <input type="submit" value="Send">
diff --git a/app/view/pages/teamtable/edit/update.php b/app/view/pages/teamtable/edit/update.php
index 3ac8b58..6145cd9 100644
--- a/app/view/pages/teamtable/edit/update.php
+++ b/app/view/pages/teamtable/edit/update.php
@@ -1,39 +1,39 @@
 <h1>Endre lagdetaljer</h1>
 <p>Her kan du oppdatere informasjonen om laget</p>
 <form method="post" autocomplete="off">
-    <label for="navn">Navn:</label>
+    <label for="LagNavn">Navn:</label>
     <br>
-    <input type="text" id="navn" name="navn" value="<?=$team['LagNavn']?>">
+    <input type="text" id="LagNavn" name="LagNavn" value="<?=$team['LagNavn']?>" maxlength="32">
 
     <br>
-    <label for="bedrift">Bedrift:</label>
+    <label for="Bedrift">Bedrift:</label>
     <br>
-    <input type="text" id="bedrift" name="bedrift" value="<?=$team['Bedrift']?>">
+    <input type="text" id="Bedrift" name="Bedrift" value="<?=$team['Bedrift']?>" maxlength="32">
 
     <br>
-    <label for="kortnummer">Kortnummer:</label>
+    <label for="Kortnummer">Kortnummer:</label>
     <br>
-    <input type="text" id="kortnummer" name="kortnummer" value="<?=$team['Kortnummer']?>">
+    <input type="text" id="Kortnummer" name="Kortnummer" value="<?=$team['Kortnummer']?>" maxlength="32">
 
     <br>
-    <label for="leder">Leder:</label>
+    <label for="Lagleder">Leder:</label>
     <br>
-    <input type="text" id="leder" name="leder" value="<?=$team['Lagleder']?>">
+    <input type="text" id="Lagleder" name="Lagleder" value="<?=$team['Lagleder']?>" maxlength="32">
     
     <br>
-    <label for="telefon">Telefon:</label>
+    <label for="Telefon">Telefon:</label>
     <br>
-    <input type="text" id="telefon" name="telefon" value="<?=$team['Telefon']?>">
+    <input type="number" id="Telefon" name="Telefon" value="<?=$team['Telefon']?>" maxlength="32">
 
     <br>
-    <label for="deltagere">Deltagere:</label>
+    <label for="Deltagere">Deltagere:</label>
     <br>
-    <input type="text" id="deltagere" name="deltagere" value="<?=$team['Deltagere']?>">
+    <input type="number" id="Deltagere" name="Deltagere" value="<?=$team['Deltagere']?>" maxlength="32">
 
     <br>
-    <label for="runder">Runder:</label>
+    <label for="Runder">Runder:</label>
     <br>
-    <input type="text" id="runder" name="runder" value="<?=$team['Runder']?>">
+    <input type="number" id="Runder" name="Runder" value="<?=$team['Runder']?>" maxlength="32">
 
     <br>
     <br>
diff --git a/public/simulator.php b/public/simulator.php
index 12615b3..eaad648 100644
--- a/public/simulator.php
+++ b/public/simulator.php
@@ -8,13 +8,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST')
     {
         $cardnumber = $_POST['cardnumber'];
 
-        if ($model->insert($cardnumber))
-        {
-            $app->session->flash("Lag funnet for \"{$cardnumber}\"", "success");
+        if (!(strlen($cardnumber) > 32)) {
+            if ($model->insert($cardnumber))
+            {
+                $app->session->flash("Lag funnet for \"{$cardnumber}\"", "success");
+            } else {
+                $app->session->flash("Opprettet lag for \"{$cardnumber}\"");
+            }
         } else {
-            $app->session->flash("Opprettet lag for \"{$cardnumber}\"");
+            $app->session->flash('Kortnummer for langt!', 'danger');
         }
-
     } else {
         $app->session->flash('Kortnummer kan ikke være tom!', 'danger');
     }
diff --git a/public/teamtable/edit/update.php b/public/teamtable/edit/update.php
index b8fa8da..26a9fb2 100644
--- a/public/teamtable/edit/update.php
+++ b/public/teamtable/edit/update.php
@@ -10,14 +10,14 @@ if (!isset($_GET['item']))
 }
 $id = $_GET['item'];
 
-// ID must be numeric
+// Id must be a number
 if (!is_numeric($id))
 {
     $app->session->flash('Kunne ikke endre lag: ID må være tall', 'danger');
     $app->redirect('index.php');
 }
 
-// Check if ID is in teamtable
+// Check if team with supplied ID exists
 $currentTeam = $model->getTeamByID($id);
 if (!$currentTeam)
 {
@@ -25,8 +25,112 @@ if (!$currentTeam)
     $app->redirect('index.php');
 }
 
-// todo: update team details here...
-// $model->updateTeamByID(...)
+if ($_SERVER['REQUEST_METHOD'] === 'POST')
+{
+    // Check that all parameters are present
+    if (!isset(
+            $_POST['LagNavn'],
+            $_POST['Bedrift'],
+            $_POST['Kortnummer'],
+            $_POST['Lagleder'],
+            $_POST['Telefon'],
+            $_POST['Deltagere'],
+            $_POST['Runder'],
+        )
+    )
+    {
+        $app->session->flash("Kunne ikke endre lag: Ikke alle POST parametere er til stede!", "danger");
+        $app->redirect('./');
+    }
+
+    $LagNavn    = $_POST['LagNavn'];
+    $Bedrift    = $_POST['Bedrift'];
+    $Kortnummer = $_POST['Kortnummer'];
+    $Lagleder   = $_POST['Lagleder'];
+    $Telefon    = $_POST['Telefon'];
+    $Deltagere  = $_POST['Deltagere'];
+    $Runder     = $_POST['Runder'];
+
+    //====Validate Input====//
+
+    $validationError = FALSE;
+
+    // LagNavn
+    if (empty($LagNavn)) {
+        $LagNavn = 'NN';
+    }
+    if (strlen($LagNavn) > 32) {
+        $validationError = TRUE;
+    }
+
+    // Bedrift
+    if (empty($Bedrift)) {
+        $Bedrift = 'NN';
+    }
+    if (strlen($Bedrift) > 32) {
+        $validationError = TRUE;
+    }
+
+    // Kortnummer
+    if (empty($Kortnummer)) {
+        $Kortnummer = 'NN';
+    }
+    if (strlen($Kortnummer) > 32) {
+        $validationError = TRUE;
+    }
+
+    // Lagleder
+    if (empty($Lagleder)) {
+        $Lagleder = 'NN';
+    }
+    if (strlen($Lagleder) > 32) {
+        $validationError = TRUE;
+    }
+
+    // Telefon
+    if (empty($Telefon)) {
+        $Telefon = 0;
+    }
+    if (strlen((string) $Telefon) > 32) {
+        $validationError = TRUE;
+    }
+
+    // Deltagere
+    if (empty($Deltagere)) {
+        $Deltagere = 0;
+    }
+    if (strlen((string) $Deltagere) > 32) {
+        $validationError = TRUE;
+    }
+
+    // Runder
+    if (empty($Runder)) {
+        $Runder = 0;
+    }
+    if (strlen((string) $Runder) > 32) {
+        $validationError = TRUE;
+    }
+
+
+    if (!$validationError) {
+        // All is good! Lets update the team details
+        $model->updateTeamByID(
+            $id, 
+            $LagNavn,
+            $Bedrift,
+            $Kortnummer,
+            $Lagleder,
+            $Telefon,
+            $Deltagere,
+            $Runder,
+        );
+
+        $app->session->flash('Lagret endringer for lag: '.$LagNavn, 'success');
+        $app->redirect('./');   
+    } else {
+        $app->session->flash('Kunne ikke endre lag: Validerings feil!', 'danger');
+    }
+}
 
 // Escape all values
 foreach ($currentTeam as $key => $value)