diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index ff9590e8d..da8ef0d73 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -17819,6 +17819,27 @@
                                             </concept_node>
                                         </children>
                                     </folder_node>
+                                    <concept_node>
+                                        <name>changeclass</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>checklists</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
new file mode 100644
index 000000000..c5a718156
--- /dev/null
+++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
@@ -0,0 +1,88 @@
+import { useMutation } from "@apollo/react-hooks";
+import { Button, Form, notification, Popconfirm, Select } from "antd";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminClass);
+
+export function JobsAdminClass({ bodyshop, job }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [updateJob] = useMutation(UPDATE_JOB);
+
+  const handleFinish = async (values) => {
+    console.log(values);
+    setLoading(true);
+    const result = await updateJob({
+      variables: { jobId: job.id, job: values },
+    });
+
+    if (!!!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+    //Get the owner details, populate it all back into the job.
+  };
+
+  useEffect(() => {
+    //form.resetFields();
+  }, [form, job]);
+
+  return (
+    <div>
+      <Form
+        onFinish={handleFinish}
+        autoComplete={"off"}
+        form={form}
+        layout="vertical"
+        initialValues={job}
+      >
+        <LayoutFormRow>
+          <Form.Item
+            name={["class"]}
+            label={t("jobs.fields.class")}
+            rules={[
+              {
+                required: bodyshop.enforce_class,
+                message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Select>
+              {bodyshop.md_classes.map((s) => (
+                <Select.Option key={s} value={s}>
+                  {s}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </LayoutFormRow>
+      </Form>
+
+      <Popconfirm
+        title={t("jobs.labels.changeclass")}
+        onConfirm={() => form.submit()}
+      >
+        <Button loading={loading}>{t("general.actions.save")}</Button>
+      </Popconfirm>
+    </div>
+  );
+}
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index a53e198ab..61471926b 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -58,7 +58,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
           </Select>
         </Form.Item>
         <Form.Item
-          name={["class"]}
+          name={"class"}
           label={t("jobs.fields.class")}
           rules={[
             {
diff --git a/client/src/components/jobs-rates/jobs-rates.component.jsx b/client/src/components/jobs-rates/jobs-rates.component.jsx
deleted file mode 100644
index 338a8eb9e..000000000
--- a/client/src/components/jobs-rates/jobs-rates.component.jsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from "react";
-
-export default function JobsRatesComponent() {
-  return <div>Jobs Rates Comp</div>;
-}
diff --git a/client/src/components/jobs-rates/jobs-rates.container.jsx b/client/src/components/jobs-rates/jobs-rates.container.jsx
deleted file mode 100644
index c952d752a..000000000
--- a/client/src/components/jobs-rates/jobs-rates.container.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from "react";
-import JobsRatesComponent from "./jobs-rates.component";
-
-export default function JobsRatesContainer() {
-  return <JobsRatesComponent />;
-}
diff --git a/client/src/pages/jobs-admin/jobs-admin.page.jsx b/client/src/pages/jobs-admin/jobs-admin.page.jsx
index 00b83262d..06a0ef852 100644
--- a/client/src/pages/jobs-admin/jobs-admin.page.jsx
+++ b/client/src/pages/jobs-admin/jobs-admin.page.jsx
@@ -5,8 +5,11 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useParams } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
-import JobAdminOwnerReassociate from "../../components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component";
 import JobCalculateTotals from "../../components/job-calculate-totals/job-calculate-totals.component";
+import JobsAdminClass from "../../components/jobs-admin-class/jobs-admin-class.component";
+import JobsAdminDatesChange from "../../components/jobs-admin-dates/jobs-admin-dates.component";
+import JobsAdminDeleteIntake from "../../components/jobs-admin-delete-intake/jobs-admin-delete-intake.component";
+import JobAdminOwnerReassociate from "../../components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component";
 import JobAdminVehicleReassociate from "../../components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component";
 import LayoutFormRow from "../../components/layout-form-row/layout-form-row.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
@@ -17,8 +20,6 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
-import JobsAdminDeleteIntake from "../../components/jobs-admin-delete-intake/jobs-admin-delete-intake.component";
-import JobsAdminDatesChange from "../../components/jobs-admin-dates/jobs-admin-dates.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -77,6 +78,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
           <JobsAdminDeleteIntake job={data ? data.jobs_by_pk : {}} />
         </LayoutFormRow>
         <JobsAdminDatesChange job={data ? data.jobs_by_pk : {}} />
+        <JobsAdminClass job={data ? data.jobs_by_pk : {}} />
       </div>
     </RbacWrapper>
   );
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8f43351a1..e25f18194 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1089,6 +1089,7 @@
 					"totals": "Totals",
 					"vehicle": "Vehicle"
 				},
+				"changeclass": "Changing the job's class can have fundamental impacts to already exported accounting items. Are you sure you want to do this?",
 				"checklists": "Checklists",
 				"closeconfirm": "Are you sure you want to close this job? This cannot be easily undone.",
 				"cost": "Cost",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 5db1bed07..d8c27751a 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1089,6 +1089,7 @@
 					"totals": "Totales",
 					"vehicle": "Vehículo"
 				},
+				"changeclass": "",
 				"checklists": "",
 				"closeconfirm": "",
 				"cost": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index ae0e007ad..6726893a1 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1089,6 +1089,7 @@
 					"totals": "Totaux",
 					"vehicle": "Véhicule"
 				},
+				"changeclass": "",
 				"checklists": "",
 				"closeconfirm": "",
 				"cost": "",