diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 74a3a9aa5..dd4f15360 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -6744,6 +6744,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>fuelin</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>fuelout</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>kmend</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/contract-cars/contract-cars.container.jsx b/client/src/components/contract-cars/contract-cars.container.jsx
index a41ca4041..36b3b7a32 100644
--- a/client/src/components/contract-cars/contract-cars.container.jsx
+++ b/client/src/components/contract-cars/contract-cars.container.jsx
@@ -14,6 +14,7 @@ export default function ContractCarsContainer({ selectedCarState, form }) {
     form.setFieldsValue({
       kmstart: record.mileage,
       dailyrate: record.dailycost,
+      fuelout: record.fuel,
     });
   };
 
diff --git a/client/src/components/contract-form/contract-form.component.jsx b/client/src/components/contract-form/contract-form.component.jsx
index a7eba372f..24cf68a40 100644
--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -9,6 +9,7 @@ import InputPhone, {
 } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
+import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 
 export default function ContractFormComponent({ form, create = false }) {
   const { t } = useTranslation();
@@ -86,6 +87,25 @@ export default function ContractFormComponent({ form, create = false }) {
           </Form.Item>
         )}
       </LayoutFormRow>
+      <LayoutFormRow grow>
+        <Form.Item
+          label={t("contracts.fields.fuelout")}
+          name="fuelout"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <CourtesyCarFuelSlider />
+        </Form.Item>
+        {create ? null : (
+          <Form.Item label={t("contracts.fields.fuelin")} name="fuelin">
+            <CourtesyCarFuelSlider />
+          </Form.Item>
+        )}
+      </LayoutFormRow>
       <LayoutFormRow>
         <Form.Item
           label={t("contracts.fields.driver_dlnumber")}
@@ -229,44 +249,6 @@ export default function ContractFormComponent({ form, create = false }) {
         </Form.Item>
       </LayoutFormRow>
 
-      <LayoutFormRow>
-        <Form.Item
-          label={t("contracts.fields.cc_num")}
-          name="cc_num"
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("contracts.fields.cc_expiry")}
-          name="cc_expiry"
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("contracts.fields.cc_cardholder")}
-          name="cc_cardholder"
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-      </LayoutFormRow>
       <LayoutFormRow>
         <Form.Item label={t("contracts.fields.dailyrate")} name="dailyrate">
           <InputNumber precision={2} />
diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
index 7966c8093..65d143488 100644
--- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
+++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.component.jsx
@@ -2,7 +2,7 @@ import { Form, InputNumber } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
-import FormDatePicker from '../form-date-picker/form-date-picker.component';
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 
 export default function CourtesyCarReturnModalComponent() {
   const { t } = useTranslation();
@@ -15,8 +15,8 @@ export default function CourtesyCarReturnModalComponent() {
         rules={[
           {
             required: true,
-            message: t("general.validation.required")
-          }
+            message: t("general.validation.required"),
+          },
         ]}
       >
         <FormDatePicker />
@@ -27,20 +27,20 @@ export default function CourtesyCarReturnModalComponent() {
         rules={[
           {
             required: true,
-            message: t("general.validation.required")
-          }
+            message: t("general.validation.required"),
+          },
         ]}
       >
         <InputNumber />
       </Form.Item>
       <Form.Item
-        label={t("courtesycars.fields.fuel")}
-        name={["courtesycar", "data", "fuel"]}
+        label={t("courtesycars.fields.fuelin")}
+        name={"fuelin"}
         rules={[
           {
             required: true,
-            message: t("general.validation.required")
-          }
+            message: t("general.validation.required"),
+          },
         ]}
       >
         <CourtesyCarFuelSlider />
diff --git a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
index 337f93938..a97a7592f 100644
--- a/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
+++ b/client/src/components/courtesy-car-return-modal/courtesy-car-return-modal.container.jsx
@@ -39,11 +39,12 @@ export function BillEnterModalContainer({
           kmend: values.kmend,
           actualreturn: values.actualreturn,
           status: "contracts.status.returned",
+          fuelin: values.fuelin,
         },
         courtesycarid: context.courtesyCarId,
         courtesycar: {
           status: "courtesycars.status.in",
-          fuel: values.fuel,
+          fuel: values.fuelin,
           mileage: values.kmend,
         },
       },
diff --git a/client/src/graphql/cccontracts.queries.js b/client/src/graphql/cccontracts.queries.js
index d4130531a..b1c0e6a05 100644
--- a/client/src/graphql/cccontracts.queries.js
+++ b/client/src/graphql/cccontracts.queries.js
@@ -60,9 +60,6 @@ export const QUERY_CONTRACT_BY_PK = gql`
     cccontracts_by_pk(id: $id) {
       actualreturn
       agreementnumber
-      cc_cardholder
-      cc_expiry
-      cc_num
       courtesycarid
       driver_addr1
       driver_city
@@ -89,6 +86,8 @@ export const QUERY_CONTRACT_BY_PK = gql`
       statetax
       localtax
       coverage
+      fuelin
+      fuelout
       job {
         id
         est_number
diff --git a/client/src/pages/contract-create/contract-create.page.component.jsx b/client/src/pages/contract-create/contract-create.page.component.jsx
index 4ca7cb03e..90e653887 100644
--- a/client/src/pages/contract-create/contract-create.page.component.jsx
+++ b/client/src/pages/contract-create/contract-create.page.component.jsx
@@ -12,15 +12,21 @@ export default function ContractCreatePageComponent({
   loading,
 }) {
   const { t } = useTranslation();
+
+  const CreateButton = (
+    <Button type="primary" onClick={() => form.submit()} loading={loading}>
+      {t("general.actions.create")}
+    </Button>
+  );
+
   return (
     <div>
-      <Button type="primary" onClick={() => form.submit()} loading={loading}>
-        {t("general.actions.create")}
-      </Button>
+      {CreateButton}
       <ContractJobsContainer selectedJobState={selectedJobState} />
       <ContractCarsContainer selectedCarState={selectedCarState} form={form} />
       <ContractLicenseDecodeButton form={form} />
       <ContractFormComponent create form={form} />
+      {CreateButton}
     </div>
   );
 }
diff --git a/client/src/pages/contract-create/contract-create.page.container.jsx b/client/src/pages/contract-create/contract-create.page.container.jsx
index 0e7c08abf..89cef34d5 100644
--- a/client/src/pages/contract-create/contract-create.page.container.jsx
+++ b/client/src/pages/contract-create/contract-create.page.container.jsx
@@ -57,6 +57,7 @@ export function ContractCreatePageContainer({
             message: t("contracts.successes.saved"),
           });
           form.resetFields();
+          form.resetFields();
           history.push(
             `/manage/courtesycars/contracts/${response.data.insert_cccontracts.returning[0].id}`
           );
@@ -99,6 +100,7 @@ export function ContractCreatePageContainer({
         layout="vertical"
         autoComplete="no"
         onFinish={handleFinish}
+        initialValues={{ fuelout: 100 }}
       >
         <ContractCreatePageComponent
           loading={loading}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index cf666ff84..3be2d4cd0 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -433,6 +433,8 @@
 				"driver_zip": "Driver's Postal/ZIP Code",
 				"excesskmrate": "Excess Mileage",
 				"federaltax": "Federal Taxes",
+				"fuelin": "Fuel In",
+				"fuelout": "Fuel Out",
 				"kmend": "Mileage End",
 				"kmstart": "Mileage Start",
 				"localtax": "Local Taxes",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index bd7dc6fac..c280fe73e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -433,6 +433,8 @@
 				"driver_zip": "",
 				"excesskmrate": "",
 				"federaltax": "",
+				"fuelin": "",
+				"fuelout": "",
 				"kmend": "",
 				"kmstart": "",
 				"localtax": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 98af9d648..717d54e8d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -433,6 +433,8 @@
 				"driver_zip": "",
 				"excesskmrate": "",
 				"federaltax": "",
+				"fuelin": "",
+				"fuelout": "",
 				"kmend": "",
 				"kmstart": "",
 				"localtax": "",
diff --git a/hasura/migrations/1607529216657_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1607529216657_update_permission_user_public_table_cccontracts/down.yaml
new file mode 100644
index 000000000..13f08fc80
--- /dev/null
+++ b/hasura/migrations/1607529216657_update_permission_user_public_table_cccontracts/down.yaml
@@ -0,0 +1,64 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - agreementnumber
+      - courtesycarid
+      - jobid
+      - status
+      - start
+      - scheduledreturn
+      - actualreturn
+      - kmstart
+      - kmend
+      - driver_dlnumber
+      - driver_dlexpiry
+      - driver_dlst
+      - driver_fn
+      - driver_ln
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_state
+      - driver_zip
+      - driver_ph1
+      - driver_dob
+      - cc_num
+      - cc_expiry
+      - cc_cardholder
+      - contract_date
+      - dailyrate
+      - actax
+      - dailyfreekm
+      - refuelcharge
+      - excesskmrate
+      - cleanupcharge
+      - damagewaiver
+      - federaltax
+      - statetax
+      - localtax
+      - coverage
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1607529216657_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1607529216657_update_permission_user_public_table_cccontracts/up.yaml
new file mode 100644
index 000000000..5ee00e237
--- /dev/null
+++ b/hasura/migrations/1607529216657_update_permission_user_public_table_cccontracts/up.yaml
@@ -0,0 +1,61 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1607529229183_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1607529229183_update_permission_user_public_table_cccontracts/down.yaml
new file mode 100644
index 000000000..a75a006db
--- /dev/null
+++ b/hasura/migrations/1607529229183_update_permission_user_public_table_cccontracts/down.yaml
@@ -0,0 +1,65 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - contract_date
+      - driver_dlexpiry
+      - driver_dob
+      - agreementnumber
+      - dailyfreekm
+      - actax
+      - cleanupcharge
+      - coverage
+      - dailyrate
+      - damagewaiver
+      - excesskmrate
+      - federaltax
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - statetax
+      - cc_cardholder
+      - cc_expiry
+      - cc_num
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlnumber
+      - driver_dlst
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - status
+      - actualreturn
+      - created_at
+      - scheduledreturn
+      - start
+      - updated_at
+      - courtesycarid
+      - id
+      - jobid
+      computed_fields: []
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1607529229183_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1607529229183_update_permission_user_public_table_cccontracts/up.yaml
new file mode 100644
index 000000000..9bed1820c
--- /dev/null
+++ b/hasura/migrations/1607529229183_update_permission_user_public_table_cccontracts/up.yaml
@@ -0,0 +1,62 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1607529236512_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1607529236512_update_permission_user_public_table_cccontracts/down.yaml
new file mode 100644
index 000000000..686a39ac4
--- /dev/null
+++ b/hasura/migrations/1607529236512_update_permission_user_public_table_cccontracts/down.yaml
@@ -0,0 +1,64 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - contract_date
+      - driver_dlexpiry
+      - driver_dob
+      - agreementnumber
+      - dailyfreekm
+      - actax
+      - cleanupcharge
+      - coverage
+      - dailyrate
+      - damagewaiver
+      - excesskmrate
+      - federaltax
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - statetax
+      - cc_cardholder
+      - cc_expiry
+      - cc_num
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlnumber
+      - driver_dlst
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - status
+      - actualreturn
+      - created_at
+      - scheduledreturn
+      - start
+      - updated_at
+      - courtesycarid
+      - id
+      - jobid
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1607529236512_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1607529236512_update_permission_user_public_table_cccontracts/up.yaml
new file mode 100644
index 000000000..d270cf269
--- /dev/null
+++ b/hasura/migrations/1607529236512_update_permission_user_public_table_cccontracts/up.yaml
@@ -0,0 +1,61 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1607529251767_alter_table_public_cccontracts_drop_column_cc_num/down.yaml b/hasura/migrations/1607529251767_alter_table_public_cccontracts_drop_column_cc_num/down.yaml
new file mode 100644
index 000000000..309ec5470
--- /dev/null
+++ b/hasura/migrations/1607529251767_alter_table_public_cccontracts_drop_column_cc_num/down.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "cc_num" text;
+  type: run_sql
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ALTER COLUMN "cc_num" DROP NOT NULL;
+  type: run_sql
diff --git a/hasura/migrations/1607529251767_alter_table_public_cccontracts_drop_column_cc_num/up.yaml b/hasura/migrations/1607529251767_alter_table_public_cccontracts_drop_column_cc_num/up.yaml
new file mode 100644
index 000000000..76ba89d71
--- /dev/null
+++ b/hasura/migrations/1607529251767_alter_table_public_cccontracts_drop_column_cc_num/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "cc_num" CASCADE;
+  type: run_sql
diff --git a/hasura/migrations/1607529263054_alter_table_public_cccontracts_drop_column_cc_expiry/down.yaml b/hasura/migrations/1607529263054_alter_table_public_cccontracts_drop_column_cc_expiry/down.yaml
new file mode 100644
index 000000000..9a32a7973
--- /dev/null
+++ b/hasura/migrations/1607529263054_alter_table_public_cccontracts_drop_column_cc_expiry/down.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "cc_expiry" text;
+  type: run_sql
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ALTER COLUMN "cc_expiry" DROP NOT NULL;
+  type: run_sql
diff --git a/hasura/migrations/1607529263054_alter_table_public_cccontracts_drop_column_cc_expiry/up.yaml b/hasura/migrations/1607529263054_alter_table_public_cccontracts_drop_column_cc_expiry/up.yaml
new file mode 100644
index 000000000..976bd0ced
--- /dev/null
+++ b/hasura/migrations/1607529263054_alter_table_public_cccontracts_drop_column_cc_expiry/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "cc_expiry" CASCADE;
+  type: run_sql
diff --git a/hasura/migrations/1607529272767_alter_table_public_cccontracts_drop_column_cc_cardholder/down.yaml b/hasura/migrations/1607529272767_alter_table_public_cccontracts_drop_column_cc_cardholder/down.yaml
new file mode 100644
index 000000000..f99ef97d2
--- /dev/null
+++ b/hasura/migrations/1607529272767_alter_table_public_cccontracts_drop_column_cc_cardholder/down.yaml
@@ -0,0 +1,11 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "cc_cardholder" text;
+  type: run_sql
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ALTER COLUMN "cc_cardholder" DROP NOT
+      NULL;
+  type: run_sql
diff --git a/hasura/migrations/1607529272767_alter_table_public_cccontracts_drop_column_cc_cardholder/up.yaml b/hasura/migrations/1607529272767_alter_table_public_cccontracts_drop_column_cc_cardholder/up.yaml
new file mode 100644
index 000000000..d14e4624e
--- /dev/null
+++ b/hasura/migrations/1607529272767_alter_table_public_cccontracts_drop_column_cc_cardholder/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "cc_cardholder" CASCADE;
+  type: run_sql
diff --git a/hasura/migrations/1607535095538_alter_table_public_courtesycars_alter_column_fuel/down.yaml b/hasura/migrations/1607535095538_alter_table_public_courtesycars_alter_column_fuel/down.yaml
new file mode 100644
index 000000000..338a3f9df
--- /dev/null
+++ b/hasura/migrations/1607535095538_alter_table_public_courtesycars_alter_column_fuel/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE ONLY "public"."courtesycars" ALTER COLUMN "fuel" SET DEFAULT
+      1;
+  type: run_sql
diff --git a/hasura/migrations/1607535095538_alter_table_public_courtesycars_alter_column_fuel/up.yaml b/hasura/migrations/1607535095538_alter_table_public_courtesycars_alter_column_fuel/up.yaml
new file mode 100644
index 000000000..abb1a4773
--- /dev/null
+++ b/hasura/migrations/1607535095538_alter_table_public_courtesycars_alter_column_fuel/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE ONLY "public"."courtesycars" ALTER COLUMN "fuel" SET DEFAULT
+      100;
+  type: run_sql
diff --git a/hasura/migrations/1607535335410_alter_table_public_cccontracts_add_column_fuelout/down.yaml b/hasura/migrations/1607535335410_alter_table_public_cccontracts_add_column_fuelout/down.yaml
new file mode 100644
index 000000000..0ed274558
--- /dev/null
+++ b/hasura/migrations/1607535335410_alter_table_public_cccontracts_add_column_fuelout/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "fuelout";
+  type: run_sql
diff --git a/hasura/migrations/1607535335410_alter_table_public_cccontracts_add_column_fuelout/up.yaml b/hasura/migrations/1607535335410_alter_table_public_cccontracts_add_column_fuelout/up.yaml
new file mode 100644
index 000000000..8f6e973f3
--- /dev/null
+++ b/hasura/migrations/1607535335410_alter_table_public_cccontracts_add_column_fuelout/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "fuelout" numeric NOT NULL
+      DEFAULT 100;
+  type: run_sql
diff --git a/hasura/migrations/1607535345739_alter_table_public_cccontracts_add_column_fuelin/down.yaml b/hasura/migrations/1607535345739_alter_table_public_cccontracts_add_column_fuelin/down.yaml
new file mode 100644
index 000000000..5507b7088
--- /dev/null
+++ b/hasura/migrations/1607535345739_alter_table_public_cccontracts_add_column_fuelin/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "fuelin";
+  type: run_sql
diff --git a/hasura/migrations/1607535345739_alter_table_public_cccontracts_add_column_fuelin/up.yaml b/hasura/migrations/1607535345739_alter_table_public_cccontracts_add_column_fuelin/up.yaml
new file mode 100644
index 000000000..9c70869ca
--- /dev/null
+++ b/hasura/migrations/1607535345739_alter_table_public_cccontracts_add_column_fuelin/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "fuelin" numeric NOT NULL DEFAULT
+      0;
+  type: run_sql
diff --git a/hasura/migrations/1607535461810_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1607535461810_update_permission_user_public_table_cccontracts/down.yaml
new file mode 100644
index 000000000..5ee00e237
--- /dev/null
+++ b/hasura/migrations/1607535461810_update_permission_user_public_table_cccontracts/down.yaml
@@ -0,0 +1,61 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1607535461810_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1607535461810_update_permission_user_public_table_cccontracts/up.yaml
new file mode 100644
index 000000000..17c8bdd8c
--- /dev/null
+++ b/hasura/migrations/1607535461810_update_permission_user_public_table_cccontracts/up.yaml
@@ -0,0 +1,63 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - fuelin
+      - fuelout
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1607535477424_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1607535477424_update_permission_user_public_table_cccontracts/down.yaml
new file mode 100644
index 000000000..9bed1820c
--- /dev/null
+++ b/hasura/migrations/1607535477424_update_permission_user_public_table_cccontracts/down.yaml
@@ -0,0 +1,62 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1607535477424_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1607535477424_update_permission_user_public_table_cccontracts/up.yaml
new file mode 100644
index 000000000..e82037eb2
--- /dev/null
+++ b/hasura/migrations/1607535477424_update_permission_user_public_table_cccontracts/up.yaml
@@ -0,0 +1,64 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - fuelin
+      - fuelout
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      computed_fields: []
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1607535485748_update_permission_user_public_table_cccontracts/down.yaml b/hasura/migrations/1607535485748_update_permission_user_public_table_cccontracts/down.yaml
new file mode 100644
index 000000000..d270cf269
--- /dev/null
+++ b/hasura/migrations/1607535485748_update_permission_user_public_table_cccontracts/down.yaml
@@ -0,0 +1,61 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1607535485748_update_permission_user_public_table_cccontracts/up.yaml b/hasura/migrations/1607535485748_update_permission_user_public_table_cccontracts/up.yaml
new file mode 100644
index 000000000..36fe09f7d
--- /dev/null
+++ b/hasura/migrations/1607535485748_update_permission_user_public_table_cccontracts/up.yaml
@@ -0,0 +1,63 @@
+- args:
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actax
+      - actualreturn
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
+      - driver_addr1
+      - driver_addr2
+      - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
+      - driver_state
+      - driver_zip
+      - excesskmrate
+      - federaltax
+      - fuelin
+      - fuelout
+      - id
+      - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
+      filter:
+        courtesycar:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: cccontracts
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 77e414148..4ba7f97da 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -838,88 +838,86 @@ tables:
               - active:
                   _eq: true
       columns:
-      - id
-      - created_at
-      - updated_at
-      - agreementnumber
-      - courtesycarid
-      - jobid
-      - status
-      - start
-      - scheduledreturn
+      - actax
       - actualreturn
-      - kmstart
-      - kmend
-      - driver_dlnumber
-      - driver_dlexpiry
-      - driver_dlst
-      - driver_fn
-      - driver_ln
+      - agreementnumber
+      - cleanupcharge
+      - contract_date
+      - courtesycarid
+      - coverage
+      - created_at
+      - dailyfreekm
+      - dailyrate
+      - damagewaiver
       - driver_addr1
       - driver_addr2
       - driver_city
+      - driver_dlexpiry
+      - driver_dlnumber
+      - driver_dlst
+      - driver_dob
+      - driver_fn
+      - driver_ln
+      - driver_ph1
       - driver_state
       - driver_zip
-      - driver_ph1
-      - driver_dob
-      - cc_num
-      - cc_expiry
-      - cc_cardholder
-      - contract_date
-      - dailyrate
-      - actax
-      - dailyfreekm
-      - refuelcharge
       - excesskmrate
-      - cleanupcharge
-      - damagewaiver
       - federaltax
-      - statetax
+      - fuelin
+      - fuelout
+      - id
+      - jobid
+      - kmend
+      - kmstart
       - localtax
-      - coverage
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
   select_permissions:
   - role: user
     permission:
       columns:
-      - contract_date
-      - driver_dlexpiry
-      - driver_dob
-      - agreementnumber
-      - dailyfreekm
       - actax
+      - actualreturn
+      - agreementnumber
       - cleanupcharge
+      - contract_date
+      - courtesycarid
       - coverage
+      - created_at
+      - dailyfreekm
       - dailyrate
       - damagewaiver
-      - excesskmrate
-      - federaltax
-      - kmend
-      - kmstart
-      - localtax
-      - refuelcharge
-      - statetax
-      - cc_cardholder
-      - cc_expiry
-      - cc_num
       - driver_addr1
       - driver_addr2
       - driver_city
+      - driver_dlexpiry
       - driver_dlnumber
       - driver_dlst
+      - driver_dob
       - driver_fn
       - driver_ln
       - driver_ph1
       - driver_state
       - driver_zip
-      - status
-      - actualreturn
-      - created_at
-      - scheduledreturn
-      - start
-      - updated_at
-      - courtesycarid
+      - excesskmrate
+      - federaltax
+      - fuelin
+      - fuelout
       - id
       - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
       filter:
         courtesycar:
           bodyshop:
@@ -935,45 +933,44 @@ tables:
   - role: user
     permission:
       columns:
-      - contract_date
-      - driver_dlexpiry
-      - driver_dob
-      - agreementnumber
-      - dailyfreekm
       - actax
+      - actualreturn
+      - agreementnumber
       - cleanupcharge
+      - contract_date
+      - courtesycarid
       - coverage
+      - created_at
+      - dailyfreekm
       - dailyrate
       - damagewaiver
-      - excesskmrate
-      - federaltax
-      - kmend
-      - kmstart
-      - localtax
-      - refuelcharge
-      - statetax
-      - cc_cardholder
-      - cc_expiry
-      - cc_num
       - driver_addr1
       - driver_addr2
       - driver_city
+      - driver_dlexpiry
       - driver_dlnumber
       - driver_dlst
+      - driver_dob
       - driver_fn
       - driver_ln
       - driver_ph1
       - driver_state
       - driver_zip
-      - status
-      - actualreturn
-      - created_at
-      - scheduledreturn
-      - start
-      - updated_at
-      - courtesycarid
+      - excesskmrate
+      - federaltax
+      - fuelin
+      - fuelout
       - id
       - jobid
+      - kmend
+      - kmstart
+      - localtax
+      - refuelcharge
+      - scheduledreturn
+      - start
+      - statetax
+      - status
+      - updated_at
       filter:
         courtesycar:
           bodyshop: