diff --git a/client/src/components/_test/test.component.jsx b/client/src/components/_test/test.component.jsx
index 26d6df86a..ab74456b6 100644
--- a/client/src/components/_test/test.component.jsx
+++ b/client/src/components/_test/test.component.jsx
@@ -1,6 +1,6 @@
 import {
   PaymentRequestButtonElement,
-  useStripe
+  useStripe,
 } from "@stripe/react-stripe-js";
 import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
@@ -9,6 +9,8 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { Input, InputNumber, Popover } from "antd";
+import { isInteger } from "lodash";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -18,13 +20,14 @@ const mapDispatchToProps = (dispatch) => ({
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
 });
 
+
+
 function Test({ bodyshop, setEmailOptions }) {
   const stripe = useStripe();
 
   const [paymentRequest, setPaymentRequest] = useState(null);
   useEffect(() => {
     if (stripe) {
-      console.log("in useeff");
       const pr = stripe.paymentRequest({
         country: "CA",
         displayItems: [{ label: "Deductible", amount: 1099 }],
@@ -37,10 +40,8 @@ function Test({ bodyshop, setEmailOptions }) {
         requestPayerEmail: true,
       });
 
-      console.log("pr", pr);
       // Check the availability of the Payment Request API.
       pr.canMakePayment().then((result) => {
-        console.log("result", result);
         if (result) {
           setPaymentRequest(pr);
         } else {
diff --git a/client/src/components/contract-status-select/contract-status-select.component.jsx b/client/src/components/contract-status-select/contract-status-select.component.jsx
index a248a1220..885b1556a 100644
--- a/client/src/components/contract-status-select/contract-status-select.component.jsx
+++ b/client/src/components/contract-status-select/contract-status-select.component.jsx
@@ -11,7 +11,7 @@ const ContractStatusComponent = (
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx b/client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx
index d4ff3db4f..07aa8df49 100644
--- a/client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx
+++ b/client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx
@@ -7,7 +7,7 @@ const CourtesyCarFuelComponent = ({ value = 100, onChange }, ref) => {
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx b/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
index 7f101590a..0c686c744 100644
--- a/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
+++ b/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
@@ -11,7 +11,7 @@ const CourtesyCarStatusComponent = (
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/components/employee-search-select/employee-search-select.component.jsx b/client/src/components/employee-search-select/employee-search-select.component.jsx
index 1e158f652..e16880bd5 100644
--- a/client/src/components/employee-search-select/employee-search-select.component.jsx
+++ b/client/src/components/employee-search-select/employee-search-select.component.jsx
@@ -12,7 +12,7 @@ const EmployeeSearchSelect = (
   const [option, setOption] = useState(value);
   const { t } = useTranslation();
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/components/field-input-number-calculator/field-input-number-calculator.component.jsx b/client/src/components/field-input-number-calculator/field-input-number-calculator.component.jsx
new file mode 100644
index 000000000..c8a03f4ce
--- /dev/null
+++ b/client/src/components/field-input-number-calculator/field-input-number-calculator.component.jsx
@@ -0,0 +1,117 @@
+import { Input, Popover } from "antd";
+import React, { useEffect, useState, forwardRef } from "react";
+
+const FieldInputNUmberCalculator = (
+  { value: formValue, onChange: formOnChange },
+  ref
+) => {
+  const [value, setValue] = useState(formValue);
+  const [total, setTotal] = useState(0);
+  const [history, setHistory] = useState([]);
+
+  const handleChange = (e) => {
+    const key = e.target.value;
+    switch (key) {
+      case "/":
+      case "*":
+      case "+":
+      case "-":
+        return;
+      default:
+        setValue(key);
+        return;
+    }
+  };
+
+  const handleKeyDown = (e) => {
+    const { key } = e;
+
+    let action;
+    switch (key) {
+      case "/":
+      case "*":
+      case "+":
+      case "-":
+        action = key;
+        break;
+      case "Enter":
+        action = "=";
+        break;
+      default:
+        return;
+    }
+
+    const val = parseFloat(value);
+    setValue(null);
+    if (!isNaN(val)) {
+      setHistory([...history, val, action]);
+    }
+  };
+
+  useEffect(() => {
+    if (value !== formValue && formOnChange) formOnChange(value);
+  }, [formOnChange, value]);
+
+  useEffect(() => {
+    if (history.length > 2) {
+      const subTotal = history.reduce((acc, val, idx) => {
+        if (idx === 0) {
+          return val;
+        }
+        switch (val) {
+          case "/":
+          case "*":
+          case "+":
+          case "-":
+            return acc;
+
+          default:
+            //Weve got math on our hands. Find the last operator, and apply it accordingly.
+            switch (history[idx - 1]) {
+              case "/":
+                return acc / val;
+              case "*":
+                return acc * val;
+              case "+":
+                return acc + val;
+              case "-":
+                return acc - val;
+              default:
+                return acc;
+            }
+        }
+      }, 0);
+      setTotal(subTotal);
+      if (history[history.length - 1] === "=") setValue(subTotal);
+    }
+  }, [history]);
+
+  const popContent = (
+    <div style={{ display: "flex", flexDirection: "column" }}>
+      History
+      {history.map((h, idx) => (
+        <div style={{ marginLeft: "auto" }} key={idx}>
+          {h}
+        </div>
+      ))}
+      <div>{total}</div>
+    </div>
+  );
+
+  return (
+    <div>
+      <Popover content={popContent} visible={history.length > 0}>
+        <Input
+          ref={ref}
+          value={value}
+          defaultValue={value}
+          onChange={handleChange}
+          onKeyDown={handleKeyDown}
+          onBlur={(e) => setHistory([])}
+        />
+      </Popover>
+    </div>
+  );
+};
+
+export default forwardRef(FieldInputNUmberCalculator);
diff --git a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
index 21324666d..7b78f4d11 100644
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -8,16 +8,16 @@ import { useTranslation } from "react-i18next";
 const DateTimePicker = ({ value, onChange, onBlur }, ref) => {
   const { t } = useTranslation();
 
-  const handleChange = (value) => {
-    if (onChange) {
-      onChange(value);
+  const handleChange = (newDate) => {
+    if (value !== newDate && onChange) {
+      onChange(newDate);
     }
   };
 
   return (
     <DatePicker
-      className='ant-picker ant-picker-input'
-      data-lpignore='true'
+      className="ant-picker ant-picker-input"
+      data-lpignore="true"
       selected={value ? new Date(value) : null}
       onChange={handleChange}
       showTimeSelect
@@ -25,7 +25,7 @@ const DateTimePicker = ({ value, onChange, onBlur }, ref) => {
       onBlur={onBlur}
       isClearable
       placeholderText={t("general.labels.selectdate")}
-      dateFormat='MMMM d, yyyy h:mm aa'
+      dateFormat="MMMM d, yyyy h:mm aa"
     />
   );
 };
diff --git a/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx b/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx
index 86e73bb72..b0df1779e 100644
--- a/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx
+++ b/client/src/components/invoice-line-search-select/invoice-line-search-select.component.jsx
@@ -13,7 +13,7 @@ const InvoiceLineSearchSelect = (
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index e8e48c6f4..9c6461023 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -11,7 +11,7 @@ const JobSearchSelect = (
   const [option, setOption] = useState(value);
 
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
index 435d46b96..7942b79ce 100644
--- a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
+++ b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
@@ -6,10 +6,10 @@ import JobTotalsTable from "../job-totals-table/job-totals-table.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import FieldInputNumberCalculator from "../field-input-number-calculator/field-input-number-calculator.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
index 64e70837f..bb0a663d2 100644
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -11,7 +11,7 @@ const VendorSearchSelect = (
   const [option, setOption] = useState(value);
 
   useEffect(() => {
-    if (onChange) {
+    if (value !== option && onChange) {
       onChange(option);
     }
   }, [option, onChange]);
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 291667c61..9442f795b 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -180,11 +180,7 @@ export function Manage({ match, conflict }) {
                 component={TestComponent}
               />
               <Route exact path={`${match.path}`} component={ManageRootPage} />
-              <Route
-                exact
-                path={`${match.path}/_test`}
-                component={TestComponent}
-              />
+
               <Route exact path={`${match.path}/jobs`} component={JobsPage} />
               <Switch>
                 <Route