diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 27e4063e0..50131a0f4 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -30396,6 +30396,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>comments</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>cost</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index e47221051..c9ce0c9a9 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -27,6 +27,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import DataLabel from "../data-label/data-label.component";
 import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
 import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
 import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
@@ -379,6 +380,9 @@ export function PartsOrderListTableComponent({
           rowKey="id"
           dataSource={record.parts_order_lines}
         />
+        <DataLabel label={t("parts_orders.fields.comments")}>
+          <div style={{ whiteSpace: "pre" }}>{record.comments}</div>
+        </DataLabel>
       </div>
     );
   };
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 5318220f2..4da7ade50 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -152,6 +152,9 @@ export default function PartsOrderModalComponent({
           );
         }}
       </Form.List>
+      <Form.Item name="comments" label={t("parts_orders.fields.comments")}>
+        <Input.TextArea rows={3} />
+      </Form.Item>
       <Radio.Group
         defaultValue={sendType}
         onChange={(e) => setSendType(e.target.value)}
diff --git a/client/src/graphql/bills.queries.js b/client/src/graphql/bills.queries.js
index aa6948d6a..cb9aa755d 100644
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -93,6 +93,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
         backordered_on
       }
       order_number
+      comments
       user_email
     }
     bills(where: { jobid: { _eq: $jobid } }, order_by: { date: desc }) {
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 10c9313b2..828fd848e 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -564,6 +564,7 @@ export const GET_JOB_BY_PK = gql`
           parts_order {
             id
             order_number
+            comments
             order_date
             user_email
             vendor {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 5c3b7c97d..a2bda3884 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1813,6 +1813,7 @@
 				"act_price": "Price",
 				"backordered_eta": "B.O. ETA",
 				"backordered_on": "B.O. On",
+				"comments": "Comments",
 				"cost": "Cost",
 				"db_price": "List Price",
 				"deliver_by": "Date",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index c22513b73..766b50960 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1813,6 +1813,7 @@
 				"act_price": "",
 				"backordered_eta": "",
 				"backordered_on": "",
+				"comments": "",
 				"cost": "",
 				"db_price": "",
 				"deliver_by": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index c0d327234..ad1276a61 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1813,6 +1813,7 @@
 				"act_price": "",
 				"backordered_eta": "",
 				"backordered_on": "",
+				"comments": "",
 				"cost": "",
 				"db_price": "",
 				"deliver_by": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 0bc94cb5c..08edb71cb 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3782,6 +3782,7 @@
               - active:
                   _eq: true
       columns:
+      - comments
       - created_at
       - deliver_by
       - id
@@ -3799,6 +3800,7 @@
   - role: user
     permission:
       columns:
+      - comments
       - created_at
       - deliver_by
       - id
@@ -3826,6 +3828,7 @@
   - role: user
     permission:
       columns:
+      - comments
       - created_at
       - deliver_by
       - id
diff --git a/hasura/migrations/1633373374089_alter_table_public_parts_orders_add_column_comments/down.sql b/hasura/migrations/1633373374089_alter_table_public_parts_orders_add_column_comments/down.sql
new file mode 100644
index 000000000..390edb6b9
--- /dev/null
+++ b/hasura/migrations/1633373374089_alter_table_public_parts_orders_add_column_comments/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."parts_orders" add column "comments" text
+--  null;
diff --git a/hasura/migrations/1633373374089_alter_table_public_parts_orders_add_column_comments/up.sql b/hasura/migrations/1633373374089_alter_table_public_parts_orders_add_column_comments/up.sql
new file mode 100644
index 000000000..fe751d2c2
--- /dev/null
+++ b/hasura/migrations/1633373374089_alter_table_public_parts_orders_add_column_comments/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."parts_orders" add column "comments" text
+ null;