diff --git a/config/packages/mapping/Workspace.orm.xml b/config/packages/mapping/Workspace.orm.xml
new file mode 100644
index 0000000..42de063
--- /dev/null
+++ b/config/packages/mapping/Workspace.orm.xml
@@ -0,0 +1,7 @@
+<doctrine-mapping>
+    <entity repository-class="App\Repositories\WorkspaceRepository" name="App\Entity\WorkspaceEntity" table="workspace">
+        <id name="id" type="string" column="id" length="8"/>
+        <field name="name" type="string" column="name" length="8"/>
+        <field name="active" type="boolean" column="active" />
+    </entity>
+</doctrine-mapping>
\ No newline at end of file
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 4374ca8..cb2c9ff 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Controller;
 
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Entity/WorkspaceEntity.php b/src/Entity/WorkspaceEntity.php
new file mode 100644
index 0000000..c7c2f5e
--- /dev/null
+++ b/src/Entity/WorkspaceEntity.php
@@ -0,0 +1,104 @@
+<?php
+namespace App\Entity;
+
+/**
+ * Entity for workspaces
+ */
+class WorkspaceEntity
+{
+    /** @var string The unique ID the workspace */
+    protected $id;
+    
+    /** @var string The name of the workspace */
+    protected $name;
+    
+    /* @var bool Is the workspace still active */
+    protected $active;
+    
+    /**
+     * Get the unique ID the workspace
+     * @return string
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+    
+    /**
+     * Set the ID of the workspace
+     * <br/> This should not be done after creation
+     * 
+     * @param string $id
+     * @return self
+     */
+    public function setId(string $id): self
+    {
+        $this->id = $id;
+        
+        return $this;
+    }
+    
+    /**
+     * Generate and save a random ID
+     * 
+     * @return string Generated ID
+     */
+    public function generateId(): string
+    {
+        // Generate ID
+        $base = array_merge(range('a', 'z'), range('A', 'Z'), range('0', '9'));
+        $id = "";
+        for ($index = 0; $index < 8; $index ++) {
+            $id .= $base[rand(0, count($base) - 1)];
+        }
+        
+        // Save and return
+        $this->setId($id);
+        return $id;
+    }
+    
+    /**
+     * Get the name of the workspace
+     * 
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+    
+    /**
+     * Set a new name for the workspace
+     * @param string $name
+     * @return self
+     */
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+        
+        return $this;
+    }
+    
+    /**
+     * If the workspace is active
+     * 
+     * @return bool
+     */
+    public function getActive(): bool
+    {
+        return $this->active;
+    }
+    
+    /**
+     * Set the active status of the workspace
+     * 
+     * @param bool $active
+     * @return self
+     */
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+        
+        return $this->active;
+    }
+}
\ No newline at end of file
diff --git a/src/Repository/WorkspaceRepository.php b/src/Repository/WorkspaceRepository.php
new file mode 100644
index 0000000..dedbfad
--- /dev/null
+++ b/src/Repository/WorkspaceRepository.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+class WorkspaceRepository extends EntityRepository
+{
+    
+}
\ No newline at end of file