diff --git a/app/lib/App/Teamtable/Team.php b/app/lib/App/Teamtable/Team.php
index 0f21907..6934017 100644
--- a/app/lib/App/Teamtable/Team.php
+++ b/app/lib/App/Teamtable/Team.php
@@ -6,7 +6,6 @@ use \InvalidArgumentException;
 
 /**
  * Represents a team in the teamtable database
- * TODO: Add validation for setters
  */
 class Team
 {
@@ -19,44 +18,92 @@ class Team
     public int $participants  = 0;
     public int $rounds        = 0;
 
+    /**
+     * PHP by default does not include multi byte functions. Therefore we use this
+     */
+    private function count_characters(string $string)
+    {
+        return count(preg_split('//u', $string, -1, PREG_SPLIT_NO_EMPTY));
+    }
+
+    /**
+     * Check if string is longer than length
+     */
+    private function longerThan(string $string, int $length): bool 
+    {
+        if ($this->count_characters($string) > $length)
+        {
+           return TRUE; 
+        }
+        return FALSE;
+    }
+
     public function setName(string $name): Self
     {
+        if ($this->longerThan($name, 32))
+        {
+            throw new InvalidArgumentException("Name is too long!");
+        }
         $this->name = $name;
         return $this;
     }
 
     public function setCompany(string $company): Self
     {
+        if ($this->longerThan($company, 32))
+        {
+            throw new InvalidArgumentException("Company is too long!");
+        }
         $this->company = $company;
         return $this;
     }
 
     public function setCardnumber(string $cardnumber): Self
     {
+        if ($this->longerThan($cardnumber, 32))
+        {
+            throw new InvalidArgumentException("Cardnumber is too long!");
+        }
         $this->cardnumber = $cardnumber;
         return $this;
     }
 
     public function setLeader(string $leader): Self
     {
+        if ($this->longerThan($leader, 32))
+        {
+            throw new InvalidArgumentException("Leader is too long!");
+        }
         $this->leader = $leader;
         return $this;
     }
 
     public function setPhone(int $phone): Self
     {
+        if ($this->longerThan($phone, 32))
+        {
+            throw new InvalidArgumentException("Phone number is too long!");
+        }
         $this->phone = $phone;
         return $this;
     }
 
     public function setParticipants(int $participants): Self
     {
+        if ($this->longerThan($participants, 32))
+        {
+            throw new InvalidArgumentException("Participants is too long!");
+        }
         $this->participants = $participants;
         return $this;
     }
 
     public function setRounds(int $rounds): Self
     {
+        if ($this->longerThan($rounds, 32))
+        {
+            throw new InvalidArgumentException("Rounds is too long!");
+        }
         $this->rounds = $rounds;
         return $this;
     }