diff --git a/src/pvv/side/motd.php b/src/pvv/side/motd.php
index 20a732c..5a1c5c3 100644
--- a/src/pvv/side/motd.php
+++ b/src/pvv/side/motd.php
@@ -4,6 +4,35 @@ declare(strict_types=1);
 
 namespace pvv\side;
 
+class MOTDItem {
+  private string $title;
+  /** @var string[] */
+  private array $content;
+
+  /**
+   * @param string[] $content
+   */
+  public function __construct(string $title, array $content) {
+    $this->title = $title;
+    $this->content = $content;
+  }
+
+  public function getTitle(): string {
+    return $this->title;
+  }
+
+  /**
+   * @return string[]
+   */
+  public function getContent(): array {
+    return $this->content;
+  }
+
+  public function getContentAsString(): string {
+    return implode("\n", $this->content);
+  }
+}
+
 class MOTD {
   private $pdo;
 
@@ -15,7 +44,7 @@ class MOTD {
     if (\is_array($content)) {
       $content = implode('_', $content);
     }
-    $query = 'INSERT INTO motd(title, content) VALUES (:title, :content);';
+    $query = 'INSERT INTO motd(title, content) VALUES (:title, :content)';
     $statement = $this->pdo->prepare($query);
 
     $statement->bindParam(':title', $title, \PDO::PARAM_STR);
@@ -24,10 +53,7 @@ class MOTD {
     $statement->execute();
   }
 
-  /**
-   * @return array{title: string, content: string[]}
-   */
-  public function getMOTD(): array {
+  public function getMOTD(): MOTDItem {
     $query = '
       SELECT
         title,
@@ -41,11 +67,16 @@ class MOTD {
 
     $data = $statement->fetch();
 
-    return ['title' => $data[0], 'content' => explode("\n", $data[1])];
+    $result = new MOTDItem(
+      $data['title'],
+      explode("\n", $data['content']),
+    );
+
+    return $result;
   }
 
   /**
-   * @return array{title: string, content: string[]}
+   * @return MOTDItem[]
    */
   public function getMOTD_history(int $limit = 5): array {
     $query = '
@@ -60,8 +91,16 @@ class MOTD {
     $statement->bindParam(':limit', $limit, \PDO::PARAM_STR);
     $statement->execute();
 
-    $data = $statement->fetch();
+    $result = array_map(
+      function ($item) {
+        return new MOTDItem(
+          $item['title'],
+          explode("\n", $item['content']),
+        );
+      },
+      $statement->fetchAll(),
+    );
 
-    return ['title' => $data[0], 'content' => explode("\n", $data[1])];
+    return $result;
   }
 }
diff --git a/www/admin/motd/index.php b/www/admin/motd/index.php
index b853c6a..6d240ea 100644
--- a/www/admin/motd/index.php
+++ b/www/admin/motd/index.php
@@ -56,10 +56,10 @@ $motd = $motdfetcher->getMOTD();
 		<form action="update.php", method="post">
 			<p class="subtitle no-chin">Tittel</p>
 			<p class="subnote">Ikke nødvendig</p>
-			<input type="text" name="title" value="<?php echo $motd['title']; ?>" class="boxinput" style="width:66%;"><br>
+			<input type="text" name="title" value="<?php echo $motd->getTitle(); ?>" class="boxinput" style="width:66%;"><br>
 
 			<p class="subtitle no-chin">Innhold (<i>markdown</i>)</p>
-			<textarea name="content" style="width:100%" rows="8" class="boxinput"><?php echo implode("\n", $motd['content']); ?></textarea>
+			<textarea name="content" style="width:100%" rows="8" class="boxinput"><?php echo $motd->getContentAsString(); ?></textarea>
 
 			<div style="margin-top: 2em;">
 				<hr class="ruler">
diff --git a/www/index.php b/www/index.php
index bec9f59..95243eb 100644
--- a/www/index.php
+++ b/www/index.php
@@ -119,7 +119,7 @@ $doorTime = $doorEntry->time->format('H:i');
 
 		<div class="gridl">
 			<?php
-        $title = $motd['title'];
+        $title = $motd->getTitle();
 
         echo '<h1>';
         if ($title == '') {
@@ -130,7 +130,7 @@ $doorTime = $doorEntry->time->format('H:i');
         echo '</h1>';
 
         $Parsedown = new Parsedown();
-        echo $Parsedown->text(implode("\n", $motd['content']));
+        echo $Parsedown->text($motd->getContentAsString());
       ?>
 		</div>
 	</main>