diff --git a/atst/models/workspace.py b/atst/models/workspace.py
index 1f82a594..f88ea7a0 100644
--- a/atst/models/workspace.py
+++ b/atst/models/workspace.py
@@ -23,3 +23,11 @@ class Workspace(Base, TimestampsMixin):
     @property
     def users(self):
         return set(role.user for role in self.roles)
+
+    @property
+    def user_count(self):
+        return len(self.users)
+
+    @property
+    def task_order(self):
+        return {"number": "task-order-number"}
diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py
index d721eb58..a94a6224 100644
--- a/atst/routes/workspaces.py
+++ b/atst/routes/workspaces.py
@@ -1,7 +1,6 @@
-from flask import Blueprint, render_template, request as http_request
-
-from atst.domain.workspaces import Members, Projects, Workspaces
+from flask import Blueprint, render_template, request as http_request, g
 
+from atst.domain.workspaces import Workspaces
 
 bp = Blueprint("workspaces", __name__)
 
diff --git a/templates/workspaces.html b/templates/workspaces.html
index 5f407766..14d4600c 100644
--- a/templates/workspaces.html
+++ b/templates/workspaces.html
@@ -11,16 +11,16 @@
       </tr>
     </thead>
     <tbody>
-    {% for w in workspaces %}
+    {% for workspace in workspaces %}
      <tr>
         <td>
-          <a class='icon-link icon-link--large' href="/workspaces/{{w['task_order']['number']}}/projects">{{ w['name'] }}</a><br>
+          <a class='icon-link icon-link--large' href="/workspaces/{{ workspace.id }}/projects">{{ workspace.name }}</a><br>
         </td>
         <td>
-          #{{ w['task_order']['number'] }}
+          #{{ workspace.task_order.number }}
         </td>
         <td>
-          <span class="label">{{ w['user_count'] }}</span><span class='h6'>Users</span>
+          <span class="label">{{ workspace.user_count }}</span><span class='h6'>Users</span>
         </td>
       </tr>
     {% endfor %}