diff --git a/src/api/klass.ts b/src/api/klass.ts
index 8b5cd96..def4fe8 100644
--- a/src/api/klass.ts
+++ b/src/api/klass.ts
@@ -1,11 +1,3 @@
-import { type Class, urls } from "codeforlife/api"
-import getReadClassEndpoints, {
-  CLASS_TAG,
-  type ListClassesArg,
-  type ListClassesResult,
-  type RetrieveClassArg,
-  type RetrieveClassResult,
-} from "codeforlife/api/endpoints/klass"
 import {
   type BulkUpdateArg,
   type BulkUpdateResult,
@@ -18,6 +10,14 @@ import {
   buildUrl,
   tagData,
 } from "codeforlife/utils/api"
+import { type Class, urls } from "codeforlife/api"
+import getReadClassEndpoints, {
+  CLASS_TAG,
+  type ListClassesArg,
+  type ListClassesResult,
+  type RetrieveClassArg,
+  type RetrieveClassResult,
+} from "codeforlife/api/endpoints/klass"
 
 import api from "."
 
diff --git a/src/api/school.ts b/src/api/school.ts
index 62e5b0c..307b76f 100644
--- a/src/api/school.ts
+++ b/src/api/school.ts
@@ -1,9 +1,3 @@
-import { type School, urls } from "codeforlife/api"
-import getReadSchoolEndpoints, {
-  type RetrieveSchoolArg,
-  type RetrieveSchoolResult,
-  SCHOOL_TAG,
-} from "codeforlife/api/endpoints/school"
 import {
   type CreateArg,
   type CreateResult,
@@ -12,6 +6,12 @@ import {
   buildUrl,
   tagData,
 } from "codeforlife/utils/api"
+import { type School, urls } from "codeforlife/api"
+import getReadSchoolEndpoints, {
+  type RetrieveSchoolArg,
+  type RetrieveSchoolResult,
+  SCHOOL_TAG,
+} from "codeforlife/api/endpoints/school"
 
 import api from "."
 
diff --git a/src/api/schoolTeacherInvitation.ts b/src/api/schoolTeacherInvitation.ts
index ea11e4e..aaa2920 100644
--- a/src/api/schoolTeacherInvitation.ts
+++ b/src/api/schoolTeacherInvitation.ts
@@ -1,4 +1,3 @@
-import { type User } from "codeforlife/api"
 import {
   type Arg,
   type CreateArg,
@@ -15,6 +14,7 @@ import {
   buildUrl,
   tagData,
 } from "codeforlife/utils/api"
+import { type User } from "codeforlife/api"
 
 import api from "."
 
diff --git a/src/api/user.ts b/src/api/user.ts
index 6fdb9e3..29b5d34 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,11 +1,3 @@
-import { type User, urls } from "codeforlife/api"
-import getReadUserEndpoints, {
-  type ListUsersArg,
-  type ListUsersResult,
-  type RetrieveUserArg,
-  type RetrieveUserResult,
-  USER_TAG,
-} from "codeforlife/api/endpoints/user"
 import {
   type Arg,
   type CreateArg,
@@ -17,6 +9,14 @@ import {
   buildUrl,
   tagData,
 } from "codeforlife/utils/api"
+import { type User, urls } from "codeforlife/api"
+import getReadUserEndpoints, {
+  type ListUsersArg,
+  type ListUsersResult,
+  type RetrieveUserArg,
+  type RetrieveUserResult,
+  USER_TAG,
+} from "codeforlife/api/endpoints/user"
 
 import api from "."
 
diff --git a/src/pages/teacherDashboard/TeacherDashboard.tsx b/src/pages/teacherDashboard/TeacherDashboard.tsx
index 9e66185..0abfc50 100644
--- a/src/pages/teacherDashboard/TeacherDashboard.tsx
+++ b/src/pages/teacherDashboard/TeacherDashboard.tsx
@@ -5,18 +5,30 @@ import { CircularProgress } from "@mui/material"
 import { type SchoolTeacherUser } from "codeforlife/api"
 import { getParam } from "codeforlife/utils/router"
 
+import Account, { type AccountProps } from "./account/Account"
+import Classes, { type ClassesProps } from "./classes/Classes"
 import {
   type RetrieveUserResult,
   useLazyRetrieveUserQuery,
 } from "../../api/user"
-import Account from "./account/Account"
-import Classes from "./classes/Classes"
-import School from "./school/School"
+import School, { type SchoolProps } from "./school/School"
 import { paths } from "../../router"
 
-export interface TeacherDashboardProps {}
+export type TeacherDashboardProps =
+  | {
+      tab: "school"
+      view?: SchoolProps["view"]
+    }
+  | {
+      tab: "classes"
+      view?: ClassesProps["view"]
+    }
+  | {
+      tab: "account"
+      view?: AccountProps["view"]
+    }
 
-const TeacherDashboard: FC<TeacherDashboardProps> = () => {
+const TeacherDashboard: FC<TeacherDashboardProps> = ({ tab, view }) => {
   let [retrieveUser, { data: authUser, isError }] = useLazyRetrieveUserQuery()
   const navigate = useNavigate()
 
@@ -41,27 +53,45 @@ const TeacherDashboard: FC<TeacherDashboardProps> = () => {
     const authSchoolTeacherUser =
       authUser as SchoolTeacherUser<RetrieveUserResult>
 
+    const tabs: page.TabBarProps["tabs"] = [
+      {
+        label: "Your school",
+        children: (
+          <School
+            authUser={authSchoolTeacherUser}
+            view={view as SchoolProps["view"]}
+          />
+        ),
+        path: getParam(paths.teacher.dashboard.tab.school, "tab"),
+      },
+      {
+        label: "Your classes",
+        children: (
+          <Classes
+            authUser={authSchoolTeacherUser}
+            view={view as ClassesProps["view"]}
+          />
+        ),
+        path: getParam(paths.teacher.dashboard.tab.classes, "tab"),
+      },
+      {
+        label: "Your account",
+        children: (
+          <Account
+            authUser={authSchoolTeacherUser}
+            view={view as AccountProps["view"]}
+          />
+        ),
+        path: getParam(paths.teacher.dashboard.tab.account, "tab"),
+      },
+    ]
+
     return (
       <page.TabBar
         header={`Welcome back, ${authUser.first_name} ${authUser.last_name}`}
         originalPath={paths.teacher.dashboard.tab._}
-        tabs={[
-          {
-            label: "Your school",
-            children: <School authUser={authSchoolTeacherUser} />,
-            path: getParam(paths.teacher.dashboard.tab.school, "tab"),
-          },
-          {
-            label: "Your classes",
-            children: <Classes authUser={authSchoolTeacherUser} />,
-            path: getParam(paths.teacher.dashboard.tab.classes, "tab"),
-          },
-          {
-            label: "Your account",
-            children: <Account authUser={authSchoolTeacherUser} />,
-            path: getParam(paths.teacher.dashboard.tab.account, "tab"),
-          },
-        ]}
+        value={tabs.findIndex(t => t.path === tab)}
+        tabs={tabs}
       />
     )
   }
diff --git a/src/pages/teacherDashboard/account/Account.tsx b/src/pages/teacherDashboard/account/Account.tsx
index 4b2eab4..dfbd3fd 100644
--- a/src/pages/teacherDashboard/account/Account.tsx
+++ b/src/pages/teacherDashboard/account/Account.tsx
@@ -5,6 +5,7 @@ import { type RetrieveUserResult } from "../../../api/user"
 
 export interface AccountProps {
   authUser: SchoolTeacherUser<RetrieveUserResult>
+  view?: "otp"
 }
 
 const Account: FC<AccountProps> = ({ authUser }) => {
diff --git a/src/pages/teacherDashboard/classes/Class.tsx b/src/pages/teacherDashboard/classes/Class.tsx
new file mode 100644
index 0000000..96c79fc
--- /dev/null
+++ b/src/pages/teacherDashboard/classes/Class.tsx
@@ -0,0 +1,9 @@
+import { type FC } from "react"
+
+export interface ClassProps {}
+
+const Class: FC<ClassProps> = () => {
+  return <>Class</>
+}
+
+export default Class
diff --git a/src/pages/teacherDashboard/classes/Classes.tsx b/src/pages/teacherDashboard/classes/Classes.tsx
index 9a57039..60b0d4f 100644
--- a/src/pages/teacherDashboard/classes/Classes.tsx
+++ b/src/pages/teacherDashboard/classes/Classes.tsx
@@ -1,14 +1,24 @@
 import { type FC } from "react"
 import { type SchoolTeacherUser } from "codeforlife/api"
 
+import Class from "./Class"
+import JoinClassRequest from "./JoinClassRequest"
 import { type RetrieveUserResult } from "../../../api/user"
 
 export interface ClassesProps {
   authUser: SchoolTeacherUser<RetrieveUserResult>
+  view?: "class" | "join-class-request"
 }
 
-const Classes: FC<ClassesProps> = ({ authUser }) => {
-  return <>TODO</>
+const Classes: FC<ClassesProps> = ({ authUser, view }) => {
+  if (view) {
+    return {
+      class: <Class />,
+      "join-class-request": <JoinClassRequest />,
+    }[view]
+  }
+
+  return <>Classes</>
 }
 
 export default Classes
diff --git a/src/pages/teacherDashboard/classes/JoinClassRequest.tsx b/src/pages/teacherDashboard/classes/JoinClassRequest.tsx
new file mode 100644
index 0000000..f3cfad1
--- /dev/null
+++ b/src/pages/teacherDashboard/classes/JoinClassRequest.tsx
@@ -0,0 +1,231 @@
+import * as form from "codeforlife/components/form"
+import * as page from "codeforlife/components/page"
+import * as yup from "yup"
+import {
+  CircularProgress,
+  Unstable_Grid2 as Grid,
+  Stack,
+  Typography,
+} from "@mui/material"
+import { type FC, useEffect, useState } from "react"
+import { type IndependentUser, type StudentUser } from "codeforlife/api"
+import { Link, LinkButton } from "codeforlife/components/router"
+import { useNavigate, useParams } from "codeforlife/hooks"
+import { TablePagination } from "codeforlife/components"
+import { generatePath } from "react-router"
+import { submitForm } from "codeforlife/utils/form"
+
+import {
+  type RetrieveClassResult,
+  useLazyRetrieveClassQuery,
+} from "../../../api/klass"
+import {
+  type RetrieveUserResult,
+  useHandleJoinClassRequestMutation,
+  useLazyListUsersQuery,
+  useLazyRetrieveUserQuery,
+} from "../../../api/user"
+import { classIdSchema } from "../../../app/schemas"
+import { paths } from "../../../router"
+
+const AddedStudent: FC<{
+  klass: RetrieveClassResult
+  user: StudentUser<RetrieveUserResult>
+}> = ({ klass, user }) => (
+  <>
+    <page.Section>
+      <Typography variant="h4" align="center" mb={0}>
+        External student added to class {klass.name} ({klass.id})
+      </Typography>
+    </page.Section>
+    <page.Section>
+      <Typography>
+        The student has been successfully added to the class {klass.name}.
+      </Typography>
+      <Typography>
+        Please provide the student with their new login details:
+      </Typography>
+    </page.Section>
+    <page.Section boxProps={{ bgcolor: "info.main" }}>
+      <Typography>
+        <strong>Class Access Code:</strong> {klass.id}
+      </Typography>
+      <Typography>
+        <strong>Name:</strong> {user.first_name}
+      </Typography>
+    </page.Section>
+    <page.Section>
+      <Typography>
+        {user.first_name} should now login as a student with these details.
+      </Typography>
+      <Typography mb={7}>
+        {user.first_name}&apos;s password is unchanged. You may manage this
+        student, including changing their name and password, as with other
+        students.
+      </Typography>
+      <Link
+        className="back-to"
+        to={generatePath(paths.teacher.dashboard.tab.classes.class._, {
+          classId: klass.id,
+        })}
+      >
+        Class
+      </Link>
+    </page.Section>
+  </>
+)
+
+const HandleRequest: FC<{
+  klass: RetrieveClassResult
+  user: IndependentUser<RetrieveUserResult>
+  onAcceptRequest: () => void
+}> = ({ klass, user, onAcceptRequest }) => {
+  const [handleJoinClassRequest] = useHandleJoinClassRequestMutation()
+
+  return (
+    <>
+      <page.Section>
+        <Typography variant="h4" align="center" mb={0}>
+          Add external student to class {klass.name} ({klass.id})
+        </Typography>
+      </page.Section>
+      <page.Section>
+        <Grid container spacing={{ xs: 2, lg: 3 }} display="flex">
+          <Grid xs={12} md={6}>
+            <TablePagination
+              useLazyListQuery={useLazyListUsersQuery}
+              filters={{ students_in_class: klass.id }}
+            >
+              {studentUsers => (
+                <Stack sx={{ height: "100%" }} margin={3}>
+                  <Typography variant="h4">
+                    Students currently in class
+                  </Typography>
+                  {studentUsers.length ? (
+                    <>
+                      <Typography mb={5}>
+                        {user.first_name}, the new external student, will be
+                        joining students in the class {klass.name} ({klass.id})
+                      </Typography>
+                      <Typography variant="h6">Student Name</Typography>
+                      {studentUsers.map((studentUser, index) => (
+                        <Typography key={index} variant="subtitle1">
+                          {studentUser.first_name}
+                        </Typography>
+                      ))}
+                    </>
+                  ) : (
+                    <Typography>
+                      The new external student {user.first_name} is joining the
+                      class {klass.name} ({klass.id}) in which there are
+                      currently no other students.
+                    </Typography>
+                  )}
+                </Stack>
+              )}
+            </TablePagination>
+          </Grid>
+          <Grid xs={12} md={6} bgcolor="info.main">
+            <Stack sx={{ height: "100%" }} margin={3}>
+              <Typography variant="h4">Add external student</Typography>
+              <Typography>
+                Please confirm the name of the new external student joining your
+                class. Their name will be used in their new login details, so
+                please ensure it is different from any other existing student in
+                the class.
+              </Typography>
+              <form.Form
+                initialValues={{
+                  id: user.id,
+                  first_name: user.first_name,
+                  accept: true,
+                }}
+                onSubmit={submitForm(handleJoinClassRequest, {
+                  then: onAcceptRequest,
+                })}
+              >
+                <form.FirstNameField
+                  required
+                  label="Student name"
+                  placeholder="Enter student's name"
+                />
+                <Stack
+                  direction="row"
+                  spacing={5}
+                  justifyContent={"center"}
+                  marginY={3}
+                >
+                  <LinkButton variant="outlined" to={-1}>
+                    Cancel
+                  </LinkButton>
+                  <form.SubmitButton>Save</form.SubmitButton>
+                </Stack>
+              </form.Form>
+            </Stack>
+          </Grid>
+        </Grid>
+        <Grid xs={12} md={6} marginTop={7}>
+          <Link
+            className="back-to"
+            to={generatePath(paths.teacher.dashboard.tab.classes.class._, {
+              classId: klass.id,
+            })}
+          >
+            Class
+          </Link>
+        </Grid>
+      </page.Section>
+    </>
+  )
+}
+
+export interface JoinClassRequestProps {}
+
+const JoinClassRequest: FC<JoinClassRequestProps> = () => {
+  const navigate = useNavigate()
+  const [wasAccepted, setWasAccepted] = useState(false)
+  const params = useParams({
+    classId: classIdSchema().required(),
+    userId: yup.number().required(),
+  })
+
+  const [
+    retrieveUser,
+    { data: user, isLoading: userIsLoading, isError: userIsError },
+  ] = useLazyRetrieveUserQuery()
+  const [
+    retrieveClass,
+    { data: klass, isLoading: classIsLoading, isError: classIsError },
+  ] = useLazyRetrieveClassQuery()
+
+  useEffect(() => {
+    if (params) {
+      retrieveUser(params.userId)
+      retrieveClass(params.classId)
+    } else navigate(paths.error.type.pageNotFound._)
+  }, [params, navigate, retrieveUser, retrieveClass])
+
+  if (!params) return <></>
+
+  if (!user || userIsLoading || !klass || classIsLoading)
+    return <CircularProgress />
+
+  if (userIsError || classIsError) alert("TODO: handle error")
+
+  return wasAccepted ? (
+    <AddedStudent
+      klass={klass}
+      user={user as StudentUser<RetrieveUserResult>}
+    />
+  ) : (
+    <HandleRequest
+      klass={klass}
+      user={user as IndependentUser<RetrieveUserResult>}
+      onAcceptRequest={() => {
+        setWasAccepted(true)
+      }}
+    />
+  )
+}
+
+export default JoinClassRequest
diff --git a/src/pages/teacherDashboard/school/Leave.tsx b/src/pages/teacherDashboard/school/Leave.tsx
new file mode 100644
index 0000000..a92cc00
--- /dev/null
+++ b/src/pages/teacherDashboard/school/Leave.tsx
@@ -0,0 +1,183 @@
+import * as form from "codeforlife/components/form"
+import * as page from "codeforlife/components/page"
+import * as yup from "yup"
+import { CircularProgress, Stack, Typography } from "@mui/material"
+import { type FC, useEffect } from "react"
+import { Link, LinkButton } from "codeforlife/components/router"
+import { type SchoolTeacher, type User } from "codeforlife/api"
+import { useNavigate, useParams } from "codeforlife/hooks"
+import { TablePagination } from "codeforlife/components"
+
+import * as table from "../../../components/table"
+import {
+  useLazyListClassesQuery,
+  useUpdateClassesMutation,
+} from "../../../api/klass"
+import {
+  useLazyListUsersQuery,
+  useLazyRetrieveUserQuery,
+} from "../../../api/user"
+import { paths } from "../../../router"
+import { submitForm } from "codeforlife/utils/form"
+import { useRemoveTeacherFromSchoolMutation } from "../../../api/teacher"
+
+export interface LeaveProps {
+  authUserId: User["id"]
+}
+
+const Leave: FC<LeaveProps> = ({ authUserId }) => {
+  const [updateClasses] = useUpdateClassesMutation()
+  const [removeTeacherFromSchool] = useRemoveTeacherFromSchoolMutation()
+  const [retrieveUser, { data: user, isLoading, isError }] =
+    useLazyRetrieveUserQuery()
+
+  const navigate = useNavigate()
+  const params = useParams({ userId: yup.number().required() })
+
+  useEffect(() => {
+    function navigateToSchoolTabWithErrorNotification(message: string) {
+      navigate(paths.teacher.dashboard.tab.school._, {
+        state: {
+          notifications: [
+            {
+              props: { children: message, error: true },
+            },
+          ],
+        },
+      })
+    }
+
+    if (!params) navigate(paths.error.type.pageNotFound._)
+    else if (isError)
+      navigateToSchoolTabWithErrorNotification("Failed to retrieve user.")
+    else if (!isLoading && !user) retrieveUser(params.userId)
+    else if (user && !user.teacher)
+      navigateToSchoolTabWithErrorNotification("This user is not a teacher.")
+  }, [params, navigate, isError, isLoading, user, retrieveUser])
+
+  if (!params || isError) return <></>
+  if (isLoading || !user) return <CircularProgress />
+  if (!user.teacher) return <></>
+
+  const isSelf = params.userId === authUserId
+
+  function handleRemoveTeacherFromSchool() {
+    removeTeacherFromSchool(user!.teacher!.id)
+      .unwrap()
+      .then(() => {
+        if (isSelf) {
+          navigate(paths.teacher.onboarding._)
+        } else {
+          navigate(paths.teacher.dashboard.tab.school._, {
+            state: {
+              notifications: [
+                {
+                  props: {
+                    children:
+                      "The teacher has been successfully removed from your school or club, and their classes were successfully transferred.",
+                  },
+                },
+              ],
+            },
+          })
+        }
+      })
+      .catch(() => {
+        // TODO: error handling strategy.
+        alert("Failed to remove teacher from school")
+      })
+  }
+
+  return (
+    <>
+      <page.Notification>
+        {isSelf
+          ? "You still have classes, you must first move them to another teacher within your school or club."
+          : "This teacher still has classes assigned to them. You must first move them to another teacher in your school or club."}
+      </page.Notification>
+      <page.Section>
+        <Typography variant="h4" align="center" marginBottom={5}>
+          Move all classes for teacher {user.first_name} {user.last_name}
+        </Typography>
+        <Link className="back-to" to={paths.teacher.dashboard.tab.school._}>
+          dashboard
+        </Link>
+        <Typography marginY={3}>
+          Please specify which teacher you would like the classes below to be
+          moved to.
+        </Typography>
+        <TablePagination
+          useLazyListQuery={useLazyListClassesQuery}
+          filters={{ teacher: user.teacher!.id }}
+        >
+          {classes => {
+            if (!classes.length) {
+              handleRemoveTeacherFromSchool()
+              return <></>
+            }
+
+            return (
+              <form.Form
+                initialValues={classes.reduce(
+                  (values, klass) => ({
+                    ...values,
+                    [klass.id]: { teacher: undefined },
+                  }),
+                  {},
+                )}
+                onSubmit={submitForm(updateClasses)}
+              >
+                <table.Table
+                  className="body"
+                  titles={["Class name", "New teacher"]}
+                >
+                  {classes.map(klass => (
+                    <table.Body key={klass.id}>
+                      <table.Cell>
+                        <Typography variant="subtitle1">
+                          {klass.name}
+                        </Typography>
+                      </table.Cell>
+                      <table.Cell direction="column" alignItems="flex-start">
+                        <form.ApiAutocompleteField
+                          useLazyListQuery={useLazyListUsersQuery}
+                          filterOptions={{ only_teachers: true, _id: user.id }}
+                          getOptionLabel={({ first_name, last_name }) =>
+                            `${first_name} ${last_name}`
+                          }
+                          getOptionKey={({ teacher }) =>
+                            (teacher as SchoolTeacher).id
+                          }
+                          textFieldProps={{
+                            required: true,
+                            name: `${klass.id}.teacher`,
+                          }}
+                          searchKey="name"
+                        />
+                      </table.Cell>
+                    </table.Body>
+                  ))}
+                </table.Table>
+                <Stack direction="row" spacing={2}>
+                  <LinkButton
+                    variant="outlined"
+                    to={paths.teacher.dashboard.tab.school._}
+                  >
+                    Cancel
+                  </LinkButton>
+                  <form.SubmitButton>
+                    {isSelf
+                      ? "Move classes and leave"
+                      : "Move classes and remove teacher"}
+                  </form.SubmitButton>
+                </Stack>
+              </form.Form>
+            )
+          }}
+        </TablePagination>
+      </page.Section>
+    </>
+  )
+}
+
+export default Leave
diff --git a/src/pages/teacherDashboard/school/School.tsx b/src/pages/teacherDashboard/school/School.tsx
index fec7d04..dc41353 100644
--- a/src/pages/teacherDashboard/school/School.tsx
+++ b/src/pages/teacherDashboard/school/School.tsx
@@ -6,37 +6,35 @@ import {
   Stack,
   Typography,
 } from "@mui/material"
-import { useLocation, useNavigate } from "codeforlife/hooks"
 import { type FC } from "react"
 import { type SchoolTeacherUser } from "codeforlife/api"
+import { generatePath } from "react-router"
+import { useNavigate } from "codeforlife/hooks"
 
-import TransferClasses, { type TransferClassesProps } from "./TransferClasses"
 import InviteTeacherForm from "./InviteTeacherForm"
+import Leave from "./Leave"
 import { type RetrieveUserResult } from "../../../api/user"
 import TeacherInvitationTable from "./TeacherInvitationTable"
 import TeacherTable from "./TeacherTable"
 import UpdateSchoolForm from "./UpdateSchoolForm"
+import { paths } from "../../../router"
 import { useRetrieveSchoolQuery } from "../../../api/school"
 
 export interface SchoolProps {
   authUser: SchoolTeacherUser<RetrieveUserResult>
+  view?: "leave"
 }
 
-const School: FC<SchoolProps> = ({ authUser }) => {
+const School: FC<SchoolProps> = ({ authUser, view }) => {
+  const navigate = useNavigate()
   const { data: school, isError } = useRetrieveSchoolQuery(
     authUser.teacher.school,
   )
-  const { state } = useLocation<{
-    transferClasses: TransferClassesProps["user"]
-  }>()
-  const navigate = useNavigate<{
-    transferClasses?: TransferClassesProps["user"]
-  }>()
 
-  if (state?.transferClasses) {
-    return (
-      <TransferClasses authUserId={authUser.id} user={state.transferClasses} />
-    )
+  if (view) {
+    return {
+      leave: <Leave authUserId={authUser.id} />,
+    }[view]
   }
 
   // TODO: handle this better
@@ -75,7 +73,11 @@ const School: FC<SchoolProps> = ({ authUser }) => {
             </Typography>
             <Button
               onClick={() => {
-                navigate(".", { state: { transferClasses: authUser } })
+                navigate(
+                  generatePath(paths.teacher.dashboard.tab.school.leave._, {
+                    userId: authUser.id,
+                  }),
+                )
               }}
             >
               Leave school or club
diff --git a/src/pages/teacherDashboard/school/TeacherTable.tsx b/src/pages/teacherDashboard/school/TeacherTable.tsx
index b5fee71..fb25456 100644
--- a/src/pages/teacherDashboard/school/TeacherTable.tsx
+++ b/src/pages/teacherDashboard/school/TeacherTable.tsx
@@ -9,6 +9,7 @@ import { Button, Typography } from "@mui/material"
 import { type FC } from "react"
 import { type SchoolTeacherUser } from "codeforlife/api"
 import { TablePagination } from "codeforlife/components"
+import { generatePath } from "react-router"
 import { useNavigate } from "codeforlife/hooks"
 
 import * as table from "../../../components/table"
@@ -17,7 +18,6 @@ import {
   type RetrieveUserResult,
   useLazyListUsersQuery,
 } from "../../../api/user"
-import { type TransferClassesProps } from "./TransferClasses"
 import { paths } from "../../../router"
 import { useSetTeacherAdminAccessMutation } from "../../../api/teacher"
 
@@ -26,9 +26,7 @@ export interface TeacherTableProps {
 }
 
 const TeacherTable: FC<TeacherTableProps> = ({ authUser }) => {
-  const navigate = useNavigate<{
-    transferClasses?: TransferClassesProps["user"]
-  }>()
+  const navigate = useNavigate()
   const [setTeacherAdminAccess] = useSetTeacherAdminAccessMutation()
 
   function showNotification(children: string, error: boolean = false) {
@@ -129,7 +127,12 @@ const TeacherTable: FC<TeacherTableProps> = ({ authUser }) => {
                     className="alert"
                     endIcon={<DeleteOutlineIcon />}
                     onClick={() => {
-                      navigate(".", { state: { transferClasses: user } })
+                      navigate(
+                        generatePath(
+                          paths.teacher.dashboard.tab.school.leave._,
+                          { userId: user.id },
+                        ),
+                      )
                     }}
                   >
                     Delete
diff --git a/src/router/paths.ts b/src/router/paths.ts
index c343b71..8c452ca 100644
--- a/src/router/paths.ts
+++ b/src/router/paths.ts
@@ -20,17 +20,25 @@ const paths = _("", {
     onboarding: _("/onboarding"),
     dashboard: _("/dashboard", {
       tab: _("/:tab", {
-        school: _({ tab: "school" }),
+        school: _(
+          { tab: "school" },
+          {
+            leave: _("/leave/:userId"),
+          },
+        ),
         classes: _(
           { tab: "classes" },
           {
-            editClass: _("/:accessCode", {
+            class: _("/:classId", {
+              joinRequest: _("/join-request/:userId"),
               additional: _("/additional"),
-              studentCredentials: _("/student-credentials"),
-              editStudent: _("/edit/?studentIds={studentIds}"),
-              resetStudents: _("/reset/?studentIds={studentIds}"),
-              moveStudents: _("/move/?studentIds={studentIds}"),
-              releaseStudents: _("/release/?studentIds={studentIds}"),
+              students: _("/students", {
+                credentials: _("/credentials"),
+                edit: _("/edit"),
+                reset: _("/reset"),
+                move: _("/move"),
+                release: _("/release"),
+              }),
             }),
           },
         ),
@@ -42,10 +50,6 @@ const paths = _("", {
           },
         ),
       }),
-      student: _("/student", {
-        accept: _("/accept/:studentId"),
-        added: _("/added"),
-      }),
     }),
   }),
   student: _("/student", {
diff --git a/src/router/routes/teacher.tsx b/src/router/routes/teacher.tsx
index fc8deb5..1820059 100644
--- a/src/router/routes/teacher.tsx
+++ b/src/router/routes/teacher.tsx
@@ -2,7 +2,6 @@ import { Route } from "react-router-dom"
 
 // import Teacher from "../../pages/teacher/Teacher"
 import TeacherDashboard from "../../pages/teacherDashboard/TeacherDashboard"
-// import AddExternalStudent from "../../pages/teacherDashboard/classes/AddExternalStudent"
 // import AddedExternalStudent from "../../pages/teacherDashboard/classes/AddedExternalStudent"
 // import StudentCredentials from "../../pages/teacherDashboard/classes/editClass/student/editStudent/StudentCredentials"
 // import TeacherOnboarding from "../../pages/teacherOnboarding/TeacherOnboarding"
@@ -13,8 +12,24 @@ const teacher = (
     {/* <Route path={paths.teacher._} element={<Teacher />} /> */}
     {/* <Route path={paths.teacher.onboarding._} element={<TeacherOnboarding />} /> */}
     <Route
-      path={paths.teacher.dashboard.tab._}
-      element={<TeacherDashboard />}
+      path={paths.teacher.dashboard.tab.school.leave._}
+      element={<TeacherDashboard tab="school" view="leave" />}
+    />
+    <Route
+      path={paths.teacher.dashboard.tab.school._}
+      element={<TeacherDashboard tab="school" />}
+    />
+    <Route
+      path={paths.teacher.dashboard.tab.classes.class.joinRequest._}
+      element={<TeacherDashboard tab="classes" view="join-class-request" />}
+    />
+    <Route
+      path={paths.teacher.dashboard.tab.classes.class._}
+      element={<TeacherDashboard tab="classes" view="class" />}
+    />
+    <Route
+      path={paths.teacher.dashboard.tab.classes._}
+      element={<TeacherDashboard tab="classes" />}
     />
     {/* <Route
       path={`${paths.teacher.dashboard.classes._}/:accessCode?/:view?`}
@@ -24,18 +39,14 @@ const teacher = (
       path={paths.teacher.dashboard.tab.classes.editClass.studentCredentials._}
       element={<StudentCredentials />}
     /> */}
+    <Route
+      path={paths.teacher.dashboard.tab.account._}
+      element={<TeacherDashboard tab="account" />}
+    />
     {/* <Route
       path={`${paths.teacher.dashboard.tab.account._}/:view?`}
       element={<TeacherDashboard tab={2} />}
     /> */}
-    {/* <Route
-      path={paths.teacher.dashboard.student.accept._}
-      element={<AddExternalStudent />}
-    /> */}
-    {/* <Route
-      path={paths.teacher.dashboard.student.added._}
-      element={<AddedExternalStudent />}
-    /> */}
   </>
 )