diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index a3fead6..901e7dc 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -1,54 +1,10 @@
-"use client";
-
-import { useState } from "react";
-import Column from "@/components/Column";
-import AddTaskForm from "@/components/AddTaskForm";
+import Board from "@/components/Board";
 
 export default function Dashboard() {
-  const [tasks, setTasks] = useState({
-    todo: [
-      {
-        title: "Finish lab",
-        description: "Complete physics lab report",
-        dueDate: "2026-08-10",
-        topic: "Physics",
-      },
-      {
-        title: "Study Next.js",
-        description: "Learn routing and layouts",
-        dueDate: "2026-08-08",
-        topic: "Coding",
-      },
-    ],
-    inProgress: [],
-    done: [],
-  });
-
-  const [showForm, setShowForm] = useState(false);
-
-  const addTask = (task: any) => {
-    setTasks((prev) => ({
-      ...prev,
-      todo: [...prev.todo, task],
-    }));
-  };
-
   return (
     <main style={styles.container}>
       <h1 style={styles.title}>Planner Danner</h1>
-
-      <div style={styles.board}>
-        <Column title="To Do" tasks={tasks.todo} onAdd={() => setShowForm(true)} />
-        <Column title="In Progress" tasks={tasks.inProgress} />
-        <Column title="Done" tasks={tasks.done} />
-      </div>
-
-      {showForm && (
-        <AddTaskForm
-          onSubmit={addTask}
-          onClose={() => setShowForm(false)}
-        />
-      )}
+      <Board />
     </main>
   );
 }
@@ -71,10 +27,4 @@ const styles = {
     `,
     marginBottom: "30px",
   },
-  board: {
-    display: "flex",
-    gap: "20px",
-    justifyContent: "center",
-  },
 };
-
diff --git a/components/Board.tsx b/components/Board.tsx
index 24fbb79..e7610bd 100644
--- a/components/Board.tsx
+++ b/components/Board.tsx
@@ -1,36 +1,430 @@
 "use client";
-import { useState } from "react";
+
+import { useCallback, useEffect, useState } from "react";
+import type { Task, TaskInput, TaskSort, TaskStatus, TaskUpdate } from "@/types/task";
+import AddTaskForm from "./AddTaskForm";
 import Column from "./Column";
+import EditTaskForm from "./EditTaskForm";
+import TaskCard from "./TaskCard";
+
+type ViewMode = "board" | "list";
+
+type TasksPayload = {
+  tasks: Task[];
+};
+
+type TaskPayload = {
+  task: Task;
+};
+
+async function readJson<T>(response: Response): Promise<T> {
+  const payload = (await response.json()) as T & { error?: string };
+
+  if (!response.ok) {
+    throw new Error(payload.error ?? "Request failed.");
+  }
+
+  return payload;
+}
 
 export default function Board() {
-  const [tasks, setTasks] = useState([
-    { id: 1, title: "Task 1", description: "Do something", status: "Todo", dueDate: "2026-08-10", topic: "Lab" },
-    { id: 2, title: "Task 2", description: "Another thing", status: "In-Progress", dueDate: "2026-08-12", topic: "Project" },
-  ]);
+  const [tasks, setTasks] = useState<Task[]>([]);
+  const [sortMode, setSortMode] = useState<TaskSort>("createdAt");
+  const [viewMode, setViewMode] = useState<ViewMode>("board");
+  const [includeArchived, setIncludeArchived] = useState(false);
+  const [showForm, setShowForm] = useState(false);
+  const [editingTask, setEditingTask] = useState<Task | null>(null);
+  const [popupTask, setPopupTask] = useState<Task | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const handleStatusChange = (taskId: number, newStatus: "Todo" | "In-Progress" | "Complete") => {
-    setTasks(prev =>
-      prev.map(t => (t.id === taskId ? { ...t, status: newStatus } : t))
+  const loadTasks = useCallback(async () => {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      const searchParams = new URLSearchParams({
+        sort: sortMode,
+        includeArchived: String(includeArchived),
+      });
+      const payload = await readJson<TasksPayload>(
+        await fetch(`/api/tasks?${searchParams.toString()}`)
+      );
+
+      setTasks(payload.tasks);
+    } catch (loadError) {
+      setError(
+        loadError instanceof Error ? loadError.message : "Tasks could not be loaded."
+      );
+    } finally {
+      setIsLoading(false);
+    }
+  }, [includeArchived, sortMode]);
+
+  useEffect(() => {
+    // Tasks are external server state, so the initial sync starts here.
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    void loadTasks();
+  }, [loadTasks]);
+
+  const createNewTask = async (task: TaskInput) => {
+    await readJson<TaskPayload>(
+      await fetch("/api/tasks", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(task),
+      })
     );
+    await loadTasks();
   };
 
-  return (
-    <div style={{ display: "flex", gap: "20px" }}>
+  const saveTaskChanges = async (id: number, updates: TaskUpdate) => {
+    await readJson<TaskPayload>(
+      await fetch("/api/tasks", {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ id, ...updates }),
+      })
+    );
+    await loadTasks();
+  };
+
+  const handleStatusChange = async (taskId: number, newStatus: TaskStatus) => {
+    try {
+      await saveTaskChanges(taskId, { status: newStatus });
+    } catch (statusError) {
+      setError(
+        statusError instanceof Error
+          ? statusError.message
+          : "Task status could not be changed."
+      );
+    }
+  };
+
+  const handleArchive = async (task: Task) => {
+    try {
+      await readJson<TaskPayload>(
+        await fetch("/api/tasks", {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ id: task.id, action: "archive" }),
+        })
+      );
+      await loadTasks();
+    } catch (archiveError) {
+      setError(
+        archiveError instanceof Error
+          ? archiveError.message
+          : "Task could not be archived."
+      );
+    }
+  };
+
+  const handleStatusClick = (task: Task) => {
+    if (task.status !== "Complete" && !task.archivedAt) {
+      setPopupTask(task);
+    }
+  };
+
+  const handleConfirmStatus = async (yes: boolean) => {
+    const task = popupTask;
+    setPopupTask(null);
+
+    if (!task || !yes) {
+      return;
+    }
+
+    if (task.status === "Todo") {
+      await handleStatusChange(task.id, "In-Progress");
+    } else if (task.status === "In-Progress") {
+      await handleStatusChange(task.id, "Complete");
+    }
+  };
+
+  const renderBoard = () => (
+    <div style={styles.board}>
       <Column
         title="Todo"
-        tasks={tasks.filter(t => t.status === "Todo")}
-        onStatusChange={handleStatusChange}
+        tasks={tasks.filter((task) => task.status === "Todo")}
+        onAdd={() => setShowForm(true)}
+        onArchive={handleArchive}
+        onEdit={setEditingTask}
+        onStatusClick={handleStatusClick}
       />
       <Column
         title="In-Progress"
-        tasks={tasks.filter(t => t.status === "In-Progress")}
-        onStatusChange={handleStatusChange}
+        tasks={tasks.filter((task) => task.status === "In-Progress")}
+        onArchive={handleArchive}
+        onEdit={setEditingTask}
+        onStatusClick={handleStatusClick}
       />
       <Column
         title="Complete"
-        tasks={tasks.filter(t => t.status === "Complete")}
-        onStatusChange={handleStatusChange}
+        tasks={tasks.filter((task) => task.status === "Complete")}
+        onArchive={handleArchive}
+        onEdit={setEditingTask}
+        onStatusClick={handleStatusClick}
       />
     </div>
   );
+
+  const renderList = () => (
+    <div style={styles.list}>
+      {tasks.map((task) => (
+        <TaskCard
+          key={task.id}
+          task={task}
+          onArchive={handleArchive}
+          onEdit={setEditingTask}
+          onStatusClick={handleStatusClick}
+        />
+      ))}
+    </div>
+  );
+
+  return (
+    <>
+      <div style={styles.toolbar}>
+        <div style={styles.segmented}>
+          <button
+            type="button"
+            style={viewMode === "board" ? styles.activeSegment : styles.segment}
+            onClick={() => setViewMode("board")}
+          >
+            Board
+          </button>
+          <button
+            type="button"
+            style={viewMode === "list" ? styles.activeSegment : styles.segment}
+            onClick={() => setViewMode("list")}
+          >
+            List
+          </button>
+        </div>
+
+        <label style={styles.controlLabel}>
+          Sort
+          <select
+            value={sortMode}
+            onChange={(event) => setSortMode(event.target.value as TaskSort)}
+            style={styles.select}
+          >
+            <option value="createdAt">Newest</option>
+            <option value="topic">Topic</option>
+            <option value="status">Status</option>
+            <option value="dueDate">Due Date</option>
+          </select>
+        </label>
+
+        <label style={styles.checkboxLabel}>
+          <input
+            type="checkbox"
+            checked={includeArchived}
+            onChange={(event) => setIncludeArchived(event.target.checked)}
+          />
+          Show archived
+        </label>
+
+        <button
+          type="button"
+          style={styles.addButton}
+          onClick={() => setShowForm(true)}
+        >
+          Add Task
+        </button>
+      </div>
+
+      {error && <div style={styles.error}>{error}</div>}
+      {isLoading && <div style={styles.emptyState}>Loading tasks...</div>}
+      {!isLoading && tasks.length === 0 && (
+        <div style={styles.emptyState}>No tasks yet.</div>
+      )}
+      {!isLoading && (
+        <>{viewMode === "board" ? renderBoard() : renderList()}</>
+      )}
+
+      {showForm && (
+        <AddTaskForm onSubmit={createNewTask} onClose={() => setShowForm(false)} />
+      )}
+
+      {editingTask && (
+        <EditTaskForm
+          task={editingTask}
+          onClose={() => setEditingTask(null)}
+          onSubmit={(updates) => saveTaskChanges(editingTask.id, updates)}
+        />
+      )}
+
+      {popupTask && (
+        <div style={styles.overlay}>
+          <div style={styles.modal}>
+            <h3 style={styles.modalTitle}>
+              {popupTask.status === "Todo"
+                ? "Are you ready to start the task?"
+                : "Have you finished this task?"}
+            </h3>
+            <div style={styles.actions}>
+              <button
+                type="button"
+                onClick={() => void handleConfirmStatus(true)}
+                style={styles.saveButton}
+              >
+                Yes
+              </button>
+              <button
+                type="button"
+                onClick={() => void handleConfirmStatus(false)}
+                style={styles.cancelButton}
+              >
+                No
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
 }
+
+const styles = {
+  toolbar: {
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: "16px",
+    flexWrap: "wrap" as const,
+    marginBottom: "24px",
+  },
+  segmented: {
+    display: "flex",
+    border: "1px solid #bae6fd",
+    borderRadius: "8px",
+    overflow: "hidden",
+    background: "#f8fafc",
+  },
+  segment: {
+    background: "#f8fafc",
+    color: "#0f172a",
+    border: "none",
+    padding: "8px 14px",
+    cursor: "pointer",
+    fontWeight: "700",
+  },
+  activeSegment: {
+    background: "#0f172a",
+    color: "white",
+    border: "none",
+    padding: "8px 14px",
+    cursor: "pointer",
+    fontWeight: "700",
+  },
+  controlLabel: {
+    display: "flex",
+    alignItems: "center",
+    gap: "8px",
+    color: "white",
+    fontWeight: "700",
+  },
+  checkboxLabel: {
+    display: "flex",
+    alignItems: "center",
+    gap: "8px",
+    color: "white",
+    fontWeight: "700",
+  },
+  select: {
+    padding: "8px",
+    border: "1px solid #bae6fd",
+    borderRadius: "8px",
+    color: "#0f172a",
+    fontWeight: "700",
+  },
+  addButton: {
+    background: "#0f172a",
+    color: "white",
+    border: "1px solid #0f172a",
+    borderRadius: "8px",
+    padding: "8px 14px",
+    cursor: "pointer",
+    fontWeight: "700",
+  },
+  board: {
+    display: "flex",
+    gap: "20px",
+    justifyContent: "center",
+    alignItems: "stretch",
+  },
+  list: {
+    maxWidth: "760px",
+    margin: "0 auto",
+  },
+  error: {
+    maxWidth: "760px",
+    margin: "0 auto 16px",
+    background: "#fee2e2",
+    color: "#991b1b",
+    border: "1px solid #fecaca",
+    borderRadius: "8px",
+    padding: "10px 12px",
+    fontWeight: "700",
+  },
+  emptyState: {
+    background: "#f8fafc",
+    color: "#0f172a",
+    borderRadius: "8px",
+    padding: "24px",
+    maxWidth: "420px",
+    margin: "0 auto",
+    textAlign: "center" as const,
+    fontWeight: "700",
+  },
+  overlay: {
+    position: "fixed" as const,
+    top: 0,
+    left: 0,
+    width: "100%",
+    height: "100%",
+    background: "rgba(0,0,0,0.4)",
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center",
+    zIndex: 1000,
+  },
+  modal: {
+    background: "#f8fafc",
+    padding: "25px",
+    borderRadius: "12px",
+    boxShadow: "0 10px 25px rgba(0,0,0,0.2)",
+    width: "300px",
+    textAlign: "center" as const,
+  },
+  modalTitle: {
+    marginBottom: "15px",
+    fontSize: "18px",
+    fontWeight: "600",
+    color: "#0f172a",
+  },
+  actions: {
+    display: "flex",
+    justifyContent: "space-between",
+    marginTop: "15px",
+  },
+  saveButton: {
+    background: "#0ea5e9",
+    color: "white",
+    border: "none",
+    padding: "8px 16px",
+    borderRadius: "8px",
+    cursor: "pointer",
+    fontWeight: "600",
+  },
+  cancelButton: {
+    background: "#e2e8f0",
+    color: "#0f172a",
+    border: "none",
+    padding: "8px 16px",
+    borderRadius: "8px",
+    cursor: "pointer",
+    fontWeight: "600",
+  },
+};
diff --git a/components/Column.tsx b/components/Column.tsx
index 024ef3c..304a397 100644
--- a/components/Column.tsx
+++ b/components/Column.tsx
@@ -1,42 +1,30 @@
 "use client";
 
 import { useState } from "react";
+import type { Task } from "@/types/task";
+import TaskCard from "./TaskCard";
+
+type SortMode = "none" | "topic" | "dueDate";
 
 export default function Column({
   title,
   tasks,
   onAdd,
-  onStatusChange,
+  onArchive,
+  onEdit,
+  onStatusClick,
 }: {
   title: string;
-  tasks: any[];
+  tasks: Task[];
   onAdd?: () => void;
-  onStatusChange?: (index: number, newStatus: "Todo" | "In-Progress" | "Complete") => void;
+  onArchive: (task: Task) => void;
+  onEdit: (task: Task) => void;
+  onStatusClick: (task: Task) => void;
 }) {
-  const [popupTaskIndex, setPopupTaskIndex] = useState<number | null>(null);
-  const [sortMode, setSortMode] = useState<"none" | "topic" | "dueDate">("none");
+  const [sortMode, setSortMode] = useState<SortMode>("none");
   const [showMenu, setShowMenu] = useState(false);
 
-  const handleCircleClick = (index: number) => {
-    const task = tasks[index];
-    if (task.status !== "Complete") {
-      setPopupTaskIndex(index);
-    }
-  };
-
-  const handleConfirm = (yes: boolean) => {
-    if (popupTaskIndex !== null && onStatusChange) {
-      const task = tasks[popupTaskIndex];
-      if (task.status === "Todo" && yes) {
-        onStatusChange(popupTaskIndex, "In-Progress");
-      } else if (task.status === "In-Progress" && yes) {
-        onStatusChange(popupTaskIndex, "Complete");
-      }
-    }
-    setPopupTaskIndex(null);
-  };
-
-  const handleSort = (mode: "none" | "topic" | "dueDate") => {
+  const handleSort = (mode: SortMode) => {
     setSortMode(mode);
     setShowMenu(false);
   };
@@ -62,14 +50,13 @@ export default function Column({
             </button>
           )}
 
-          {/* Sort button */}
           <div style={{ position: "relative" }}>
             <button
               onClick={() => setShowMenu(!showMenu)}
               style={styles.iconButton}
               title="Sort Tasks"
             >
-              ⇅
+              Sort
             </button>
             {showMenu && (
               <div style={styles.dropdown}>
@@ -85,8 +72,6 @@ export default function Column({
               </div>
             )}
           </div>
-
-          <button style={styles.iconButton} title="More Options">⋮</button>
         </div>
       </div>
 
@@ -96,57 +81,15 @@ export default function Column({
         </div>
       )}
 
-      {sortedTasks.map((task, index) => (
-        <div key={index} style={styles.card}>
-          <div style={styles.cardHeader}>
-            {/* Hollow circle */}
-            <div
-              style={{
-                ...styles.circle,
-                cursor: task.status === "Complete" ? "default" : "pointer",
-              }}
-              onClick={() => handleCircleClick(index)}
-              title="Change Status"
-            >
-              {task.status === "In-Progress" || task.status === "Complete" ? "✔" : ""}
-            </div>
-
-            <div style={styles.cardTitle}>{task.title}</div>
-            <button style={styles.iconButton}>⋮</button>
-          </div>
-          <div style={styles.cardDescription}>
-            {task.description.slice(0, 30)}
-            {task.description.length > 30 && "..."}
-          </div>
-          <div style={styles.cardDate}>📅 {task.dueDate}</div>
-          {task.topic && (
-            <div style={styles.cardTopic}>
-              <em>{task.topic}</em>
-            </div>
-          )}
-        </div>
+      {sortedTasks.map((task) => (
+        <TaskCard
+          key={task.id}
+          task={task}
+          onArchive={onArchive}
+          onEdit={onEdit}
+          onStatusClick={onStatusClick}
+        />
       ))}
-
-      {/* Popup */}
-      {popupTaskIndex !== null && (
-        <div style={styles.overlay}>
-          <div style={styles.modal}>
-            <h3 style={styles.title}>
-              {tasks[popupTaskIndex].status === "Todo"
-                ? "Are you ready to start the task?"
-                : "Have you finished this task?"}
-            </h3>
-            <div style={styles.actions}>
-              <button onClick={() => handleConfirm(true)} style={styles.saveButton}>
-                Yes
-              </button>
-              <button onClick={() => handleConfirm(false)} style={styles.cancelButton}>
-                No
-              </button>
-            </div>
-          </div>
-        </div>
-      )}
     </div>
   );
 }
@@ -178,8 +121,8 @@ const styles = {
     background: "transparent",
     border: "none",
     color: "#0f172a",
-    fontSize: "22px",
-    fontWeight: "600",
+    fontSize: "16px",
+    fontWeight: "700",
     cursor: "pointer",
     padding: "0",
     display: "flex",
@@ -198,102 +141,6 @@ const styles = {
     fontStyle: "italic",
     color: "#0f172a",
   },
-  card: {
-    background: "#dae4f0",
-    padding: "18px",
-    borderRadius: "12px",
-    marginBottom: "15px",
-    color: "#0f172a",
-    fontSize: "16px",
-  },
-  cardHeader: {
-    display: "flex",
-    justifyContent: "space-between",
-    alignItems: "center",
-    marginBottom: "6px",
-    gap: "10px",
-  },
-  cardTitle: {
-    fontWeight: "700",
-    flex: 1,
-  },
-  cardDescription: {
-    fontSize: "13px",
-    opacity: 0.7,
-    marginBottom: "8px",
-  },
-  cardDate: {
-    fontSize: "12px",
-    opacity: 0.6,
-  },
-  cardTopic: {
-    fontSize: "12px",
-    opacity: 0.7,
-    textAlign: "right" as const,
-    marginTop: "6px",
-    fontStyle: "italic",
-  },
-  circle: {
-    width: "20px",
-    height: "20px",
-    border: "2px solid black",
-    borderRadius: "50%",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    fontSize: "14px",
-    fontWeight: "bold",
-    backgroundColor: "white",
-  },
-  overlay: {
-    position: "fixed" as const,
-    top: 0,
-    left: 0,
-    width: "100%",
-    height: "100%",
-    background: "rgba(0,0,0,0.4)",
-    display: "flex",
-    justifyContent: "center",
-    alignItems: "center",
-    zIndex: 1000,
-  },
-  modal: {
-    background: "#f8fafc",
-    padding: "25px",
-    borderRadius: "12px",
-    boxShadow: "0 10px 25px rgba(0,0,0,0.2)",
-    width: "300px",
-    textAlign: "center" as const,
-  },
-  title: {
-    marginBottom: "15px",
-    fontSize: "18px",
-    fontWeight: "600",
-    color: "#0f172a",
-  },
-  actions: {
-    display: "flex",
-    justifyContent: "space-between",
-    marginTop: "15px",
-  },
-  saveButton: {
-    background: "#0ea5e9",
-    color: "white",
-    border: "none",
-    padding: "8px 16px",
-    borderRadius: "8px",
-    cursor: "pointer",
-    fontWeight: "600",
-  },
-  cancelButton: {
-    background: "#e2e8f0",
-    color: "#0f172a",
-    border: "none",
-    padding: "8px 16px",
-    borderRadius: "8px",
-    cursor: "pointer",
-    fontWeight: "600",
-  },
   dropdown: {
     position: "absolute" as const,
     top: "30px",
@@ -315,4 +162,4 @@ const styles = {
     fontSize: "14px",
     color: "#0f172a",
   },
-};
\ No newline at end of file
+};