diff --git a/client/src/components/_test/test.component.jsx b/client/src/components/_test/test.component.jsx
index 87ec8db4c..60f72bb3c 100644
--- a/client/src/components/_test/test.component.jsx
+++ b/client/src/components/_test/test.component.jsx
@@ -1,5 +1,4 @@
 import { Editor } from "@tinymce/tinymce-react";
-import { Col, Row } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { connect } from "react-redux";
@@ -32,50 +31,46 @@ export default connect(
 
   return (
     <div>
-      <Row>
-        <Col span={12}>
-          <button
-            onClick={() => {
-              axios
-                .post("/render", {
-                  view: state,
-                  context: {
-                    people: ["Yehuda Katz", "Alan Johnson", "Charles Jolley"],
-                  },
-                })
-                .then((r) => {
-                  var newWin = window.open(
-                    "url",
-                    "windowName",
-                    "height=300,width=300"
-                  );
-                  newWin.document.write(r.data);
-                });
-            }}
-          >
-            TinyMCE
-          </button>
-          <Editor
-            value={state}
-            apiKey="f3s2mjsd77ya5qvqkee9vgh612cm6h41e85efqakn2d0kknk"
-            init={{
-              height: 500,
-              //menubar: false,
-              encoding: "raw",
-              extended_valid_elements: "span",
+      <button
+        onClick={() => {
+          axios
+            .post("/render", {
+              view: state,
+              context: {
+                people: ["Yehuda Katz", "Alan Johnson", "Charles Jolley"],
+              },
+            })
+            .then((r) => {
+              var newWin = window.open(
+                "url",
+                "windowName",
+                "height=300,width=300"
+              );
+              newWin.document.write(r.data);
+            });
+        }}
+      >
+        TinyMCE
+      </button>
+      <Editor
+        value={state}
+        apiKey="f3s2mjsd77ya5qvqkee9vgh612cm6h41e85efqakn2d0kknk"
+        init={{
+          height: 500,
+          //menubar: false,
+          encoding: "raw",
+          extended_valid_elements: "span",
 
-              plugins: [
-                "advlist autolink lists link image charmap print preview anchor",
-                "searchreplace visualblocks code fullscreen",
-                "insertdatetime media table paste code help wordcount",
-              ],
-              toolbar:
-                "undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | help",
-            }}
-            onEditorChange={handleEditorChange}
-          />
-        </Col>
-      </Row>
+          plugins: [
+            "advlist autolink lists link image charmap print preview anchor",
+            "searchreplace visualblocks code fullscreen",
+            "insertdatetime media table paste code help wordcount",
+          ],
+          toolbar:
+            "undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | help",
+        }}
+        onEditorChange={handleEditorChange}
+      />
 
       <button
         onClick={() =>
@@ -111,13 +106,13 @@ export default connect(
               Subject: "TODO FIX ME",
             },
             template: {
-              name: "appointment_reminder2222222",
-              variables: { id: "2b42336f-b8de-4f04-a053-d6bff034d384" },
+              name: "parts_order_confirmation",
+              variables: { id: "6fea31e9-ea85-4c89-ac56-6f9cc84531fe" },
             },
           })
         }
       >
-        Set email config. 222222
+        Parts Order
       </button>
     </div>
   );
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index c215518f8..9dc1d5020 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -1,11 +1,10 @@
 import { useMutation, useQuery } from "@apollo/react-hooks";
 import { Form, Modal, notification } from "antd";
-import React, { useState, useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import PartsOrderEmailTemplate from "../../emails/templates/parts-order/parts-order.email";
-import { REPORT_QUERY_PARTS_ORDER_BY_PK } from "../../emails/templates/parts-order/parts-order.query";
+import { EmailSettings } from "../../emails/constants";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
 import { INSERT_NEW_PARTS_ORDERS } from "../../graphql/parts-orders.queries";
 import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries";
@@ -19,7 +18,6 @@ import {
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
-import { EmailSettings } from "../../emails/constants";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -95,15 +93,12 @@ export function PartsOrderModalContainer({
                     null,
                   replyTo: bodyshop.email,
                 },
-                template: PartsOrderEmailTemplate,
-                queryConfig: [
-                  REPORT_QUERY_PARTS_ORDER_BY_PK,
-                  {
-                    variables: {
-                      id: r.data.insert_parts_orders.returning[0].id,
-                    },
+                template: {
+                  name: "parts_order_confirmation",
+                  variables: {
+                    id: r.data.insert_parts_orders.returning[0].id,
                   },
-                ],
+                },
               });
             }
           })
diff --git a/sendemail.js b/sendemail.js
index 868c6b65b..4ae843181 100644
--- a/sendemail.js
+++ b/sendemail.js
@@ -7,12 +7,12 @@ var transporter = nodemailer.createTransport({
   secure: true, // upgrade later with STARTTLS
   auth: {
     user: process.env.email_api,
-    pass: process.env.email_secret
-  }
+    pass: process.env.email_secret,
+  },
 });
 
 // verify connection configuration
-transporter.verify(function(error, success) {
+transporter.verify(function (error, success) {
   if (error) {
     console.log(error);
   } else {
@@ -22,17 +22,18 @@ transporter.verify(function(error, success) {
 
 exports.sendEmail = (req, res) => {
   if (process.env.NODE_ENV !== "production") {
-    console.log("[EMAIL] Incoming Message Body", req.body);
+    //console.log("[EMAIL] Incoming Message Body", req.body);
+    console.log("[EMAIL] Incoming Message", req.body.from.name);
   }
   transporter.sendMail(
     {
       ...req.body,
       from: {
         name: req.body.from.name || "No Reply @ Bodyshop.app",
-        address: "noreply@bodyshop.app"
-      }
+        address: "noreply@bodyshop.app",
+      },
     },
-    function(error, info) {
+    function (error, info) {
       if (error) {
         console.log("[EMAIL] Email send failed. ", error);
         res.json({ success: false, error: error });
diff --git a/server/render/renderHandlebars.js b/server/render/renderHandlebars.js
index d8b1eab59..db1a381c5 100644
--- a/server/render/renderHandlebars.js
+++ b/server/render/renderHandlebars.js
@@ -4,6 +4,9 @@ const Handlebars = require("handlebars");
 exports.render = (req, res) => {
   //Perform request validation
   let view;
+  console.log("[HJS Render] New Render Request.");
+
+  //console.log("[HJS Render] Context", req.body.context);
   if (req.body.context.bodyshop.template_header) {
     console.log("[HJS Render] Including Header");
     view = `${req.body.context.bodyshop.template_header}${req.body.view}`;