diff --git a/apps/jetstream/src/app/components/create-object-and-fields/CreateFields.tsx b/apps/jetstream/src/app/components/create-object-and-fields/CreateFields.tsx
index 9c2c6a6e9..468dffef8 100644
--- a/apps/jetstream/src/app/components/create-object-and-fields/CreateFields.tsx
+++ b/apps/jetstream/src/app/components/create-object-and-fields/CreateFields.tsx
@@ -196,9 +196,11 @@ export const CreateFields: FunctionComponent<CreateFieldsProps> = () => {
           {rows.map((row, i) => (
             <CreateFieldsRow
               key={row._key}
+              rows={rows}
               rowIdx={i}
               enableDelete={rows.length > 1}
               selectedOrg={selectedOrg}
+              selectedSObjects={selectedSObjects}
               values={row}
               allValid={row._allValid}
               onChange={(field, value) => changeRow(row._key, field, value)}
diff --git a/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsFormulaEditor.tsx b/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsFormulaEditor.tsx
new file mode 100644
index 000000000..3946b10d0
--- /dev/null
+++ b/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsFormulaEditor.tsx
@@ -0,0 +1,332 @@
+import { css } from '@emotion/react';
+import { logger } from '@jetstream/shared/client-logger';
+import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
+import { SplitWrapper as Split } from '@jetstream/splitjs';
+import { Maybe, SalesforceOrgUi } from '@jetstream/types';
+import { Grid, KeyboardShortcut, Modal, Spinner, Textarea } from '@jetstream/ui';
+import Editor, { OnMount, useMonaco } from '@monaco-editor/react';
+import * as formulon from 'formulon';
+import { Field } from 'jsforce';
+import type { editor } from 'monaco-editor';
+import { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
+import { registerCompletions } from '../formula-evaluator/formula-evaluator.editor-utils';
+import {
+  FieldDefinition,
+  FieldValue,
+  FieldValueState,
+  FieldValues,
+  SalesforceFieldType,
+} from '../shared/create-fields/create-fields-types';
+import FormulaEvaluatorRecordSearch from '../shared/formula-evaluator/FormulaEvaluatorRecordSearch';
+import FormulaEvaluatorResults from '../shared/formula-evaluator/FormulaEvaluatorResults';
+import FormulaEvaluatorUserSearch from '../shared/formula-evaluator/FormulaEvaluatorUserSearch';
+import { getFormulaData } from '../shared/formula-evaluator/formula-evaluator.utils';
+
+// Lazy import
+const prettier = import('prettier/standalone');
+const prettierBabelParser = import('prettier/parser-babel');
+
+export interface CreateFieldsFormulaEditorProps {
+  id: string;
+  selectedOrg: SalesforceOrgUi;
+  selectedSObjects: string[];
+  field: FieldDefinition;
+  disabled: Maybe<boolean>;
+  allValues: FieldValues;
+  rows: FieldValues[];
+  valueState: FieldValueState;
+  onChange: (value: FieldValue) => void;
+  onBlur: () => void;
+}
+
+export const CreateFieldsFormulaEditor = forwardRef<any, CreateFieldsFormulaEditorProps>(
+  ({ id, selectedOrg, selectedSObjects = [], allValues, field, valueState, disabled = false, rows, onChange, onBlur }, ref) => {
+    const { value, touched, errorMessage } = valueState;
+    const isMounted = useRef(true);
+    const editorRef = useRef<editor.IStandaloneCodeEditor>();
+    const [isOpen, setIsOpen] = useState(false);
+    const [loading, setLoading] = useState(false);
+    const [fieldErrorMessage, setFieldErrorMessage] = useState<string | null>(null);
+    const [formulaErrorMessage, setFormulaErrorMessage] = useState<string | null>(null);
+    const [formulaValue, setFormulaValue] = useState((value as string) || '');
+    const [additionalFieldMetadata, setAdditionalFieldMetadata] = useState<Partial<Field>[]>([]);
+
+    const [results, setResults] = useState<{ formulaFields: formulon.FormulaData; parsedFormula: formulon.FormulaResult } | null>(null);
+
+    const [selectedUserId, setSelectedUserId] = useState('');
+    const [recordId, setRecordId] = useState('');
+
+    const monaco = useMonaco();
+
+    useEffect(() => {
+      isMounted.current = true;
+      return () => {
+        isMounted.current = false;
+      };
+    }, []);
+
+    useEffect(() => {
+      monaco && registerCompletions(monaco, selectedOrg, selectedSObjects[0], additionalFieldMetadata);
+    }, [monaco, selectedOrg, selectedSObjects[0], additionalFieldMetadata]);
+
+    useEffect(() => {
+      if (isOpen) {
+        setFormulaValue((value as string) || '');
+        setAdditionalFieldMetadata(
+          rows
+            .filter((row) => row.fullName.value && allValues.fullName.value !== row.fullName.value)
+            .map((row): Partial<Field> => {
+              return {
+                name: (row.fullName.value as string) || '',
+                label: `${(row.label.value as string) || ''} (NEW FIELD)`,
+                type: row.type.value as any,
+                relationshipName: (row.relationshipName.value as string) || null,
+                referenceTo: row.referenceTo.value ? [row.referenceTo.value as string] : [],
+              };
+            })
+        );
+      }
+    }, [isOpen, rows]);
+
+    /**
+     * Open a modal or side drawer to edit the formula
+     * show an editor
+     * ideally would be able to test the formula, but might be challenging in this case as some fields might not exist yet
+     * we should include other fields user is creating as options to select to validate the formula
+     */
+
+    const handleTestFormula = useCallback(async (value: string) => {
+      try {
+        // if (testFormulaDisabled) {
+        //   return;
+        // }
+        setLoading(true);
+        setFieldErrorMessage(null);
+        setFormulaErrorMessage(null);
+        setResults(null);
+        const fields = formulon.extract(value);
+        // TODO: see if any fields do not yet exist
+        let formulaFields: formulon.FormulaData = {};
+        if (fields.length) {
+          // FIXME: what about fields that do not yet exist?
+          // FIXME: what if there are no records on this object?
+          const response = await getFormulaData({
+            fields,
+            recordId,
+            selectedOrg,
+            selectedUserId,
+            sobjectName: selectedSObjects[0] || '',
+            numberNullBehavior: (allValues.formulaTreatBlanksAs.value as any) || 'BLANK',
+          });
+          if (response.type === 'error') {
+            setFieldErrorMessage(response.message);
+            return;
+          }
+          formulaFields = response.formulaFields;
+        }
+        const parsedFormula = formulon.parse(value, formulaFields);
+        logger.log('results', parsedFormula);
+        setResults({
+          formulaFields,
+          parsedFormula,
+        });
+        // trackEvent(ANALYTICS_KEYS.formula_execute, { success: true, fieldCount: fields.length, objectPrefix: recordId.substring(0, 3) });
+      } catch (ex) {
+        logger.warn(ex);
+        setFormulaErrorMessage(ex.message);
+        // trackEvent(ANALYTICS_KEYS.formula_execute, { success: false, message: ex.message, stack: ex.stack });
+      } finally {
+        setLoading(false);
+      }
+    }, []);
+
+    useNonInitialEffect(() => {
+      if (monaco && editorRef.current) {
+        editorRef.current.addAction({
+          id: 'modifier-enter',
+          label: 'Submit',
+          keybindings: [monaco?.KeyMod.CtrlCmd | monaco?.KeyCode.Enter],
+          run: (currEditor) => {
+            handleTestFormula(currEditor.getValue());
+          },
+        });
+      }
+    }, [handleTestFormula, monaco, selectedOrg]);
+
+    function handleEditorChange(value, event) {
+      setFormulaValue(value);
+    }
+
+    // FIXME: Error: Can only have one anonymous define call per script file
+    // const handleFormat = async (value = formulaValue) => {
+    //   try {
+    //     if (!editorRef.current || !formulaValue) {
+    //       return;
+    //     }
+    //     editorRef.current.setValue(
+    //       (await prettier).format(value, {
+    //         parser: 'babel',
+    //         plugins: [await prettierBabelParser],
+    //         bracketSpacing: false,
+    //         semi: false,
+    //         singleQuote: true,
+    //         trailingComma: 'none',
+    //         useTabs: false,
+    //         tabWidth: 2,
+    //       })
+    //     );
+    //   } catch (ex) {
+    //     logger.warn('failed to format', ex);
+    //   }
+    // };
+
+    const handleApexEditorMount: OnMount = (currEditor, monaco) => {
+      editorRef.current = currEditor;
+      // this did not run on initial render if used in useEffect
+      editorRef.current.addAction({
+        id: 'modifier-enter',
+        label: 'Submit',
+        keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter],
+        run: (currEditor) => {
+          handleTestFormula(currEditor.getValue());
+        },
+      });
+      // editorRef.current.addAction({
+      //   id: 'format',
+      //   label: 'Format',
+      //   contextMenuGroupId: '9_cutcopypaste',
+      //   run: (currEditor) => {
+      //     handleFormat(currEditor.getValue());
+      //   },
+      // });
+    };
+
+    function handleClose() {
+      onChange(formulaValue);
+      setIsOpen(false);
+    }
+
+    return (
+      <div>
+        <Textarea
+          id={`${id}-${field.label}`}
+          label={field.label}
+          isRequired={field.required}
+          helpText={typeof field.helpText === 'function' ? field.helpText(allValues.type.value as SalesforceFieldType) : field.helpText}
+          labelHelp={typeof field.labelHelp === 'function' ? field.labelHelp(allValues.type.value as SalesforceFieldType) : field.labelHelp}
+          hasError={touched && !!errorMessage}
+          errorMessage={errorMessage}
+        >
+          <textarea
+            id={`${id}-${field.label}`}
+            className="slds-textarea"
+            placeholder={field.placeholder}
+            value={value as string}
+            disabled
+            rows={1}
+            onChange={(event) => onChange(event.target.value)}
+            onBlur={onBlur}
+          />
+        </Textarea>
+        <button
+          type="button"
+          className="slds-button slds-button_neutral slds-button_stretch"
+          onClick={() => setIsOpen(true)}
+          disabled={!!disabled}
+        >
+          Edit Formula
+        </button>
+        {isOpen && (
+          <Modal
+            header="Formula Editor"
+            size="lg"
+            footer={
+              <Grid align="end">
+                <button className="slds-button slds-button_brand" onClick={handleClose}>
+                  Close
+                </button>
+              </Grid>
+            }
+            onClose={handleClose}
+          >
+            <div
+              className="slds-is-relative"
+              css={css`
+                height: 75vh;
+                min-height: 75vh;
+                max-height: 75vh;
+              `}
+            >
+              {loading && <Spinner size="small" />}
+              <Grid align="spread">
+                <KeyboardShortcut keys={['ctrl', 'space']} postContent="to open the auto-complete menu in the editor." />
+                {/* <button
+                  className="slds-button slds-text-link_reset slds-text-link"
+                  title="Format soql query"
+                  onClick={() => handleFormat()}
+                >
+                  format
+                </button> */}
+              </Grid>
+              <Split
+                sizes={[80, 20]}
+                minSize={[300, 300]}
+                gutterSize={10}
+                className="slds-gutters slds-is-relative slds-m-top_x-small"
+                css={css`
+                  display: flex;
+                  flex-direction: row;
+                `}
+              >
+                <div
+                  className=""
+                  css={css`
+                    height: 75vh;
+                  `}
+                >
+                  {/* <AutoFullHeightContainer
+                    fillHeight
+                    bottomBuffer={180}
+                    setHeightAttr
+                    className="slds-scrollable_none slds-scrollable-y_none"
+                  > */}
+                  <Editor
+                    theme="vs-dark"
+                    defaultLanguage="sfdc-formula"
+                    value={formulaValue}
+                    options={{
+                      acceptSuggestionOnEnter: 'smart',
+                      minimap: { enabled: false },
+                      suggest: {
+                        showKeywords: true,
+                      },
+                    }}
+                    onMount={handleApexEditorMount}
+                    onChange={handleEditorChange}
+                  />
+                  {/* </AutoFullHeightContainer> */}
+                </div>
+                <Grid vertical>
+                  <FormulaEvaluatorUserSearch selectedOrg={selectedOrg} disabled={loading} onSelectedRecord={setSelectedUserId} />
+                  <FormulaEvaluatorRecordSearch
+                    selectedOrg={selectedOrg}
+                    selectedSObject={selectedSObjects[0]}
+                    disabled={!!loading || !selectedSObjects[0]}
+                    fieldErrorMessage={fieldErrorMessage}
+                    onSelectedRecord={setRecordId}
+                  />
+                  <button className="slds-button slds-button_brand" onClick={() => handleTestFormula(formulaValue)}>
+                    Test Formula
+                  </button>
+                  <FormulaEvaluatorResults errorMessage={formulaErrorMessage} results={results} />
+                </Grid>
+              </Split>
+            </div>
+          </Modal>
+        )}
+      </div>
+    );
+  }
+);
+
+export default CreateFieldsFormulaEditor;
diff --git a/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRow.tsx b/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRow.tsx
index 85d97f07f..8b0782256 100644
--- a/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRow.tsx
+++ b/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRow.tsx
@@ -1,6 +1,6 @@
 import { SalesforceOrgUi } from '@jetstream/types';
 import { Grid, Icon, Tooltip } from '@jetstream/ui';
-import React, { FunctionComponent } from 'react';
+import { FunctionComponent } from 'react';
 import { FieldDefinitionType, FieldValue, FieldValues, SalesforceFieldType } from '../shared/create-fields/create-fields-types';
 import {
   baseFields,
@@ -17,8 +17,10 @@ export interface CreateFieldsRowProps {
   rowIdx: number;
   enableDelete?: boolean;
   selectedOrg: SalesforceOrgUi;
+  selectedSObjects: string[];
   values: FieldValues;
   allValid: boolean;
+  rows: FieldValues[];
   onChange: (field: FieldDefinitionType, value: FieldValue) => void;
   onClone: () => void;
   onDelete: () => void;
@@ -30,8 +32,10 @@ export const CreateFieldsRow: FunctionComponent<CreateFieldsRowProps> = ({
   rowIdx,
   enableDelete,
   selectedOrg,
+  selectedSObjects,
   values,
   allValid,
+  rows,
   onChange,
   onClone,
   onDelete,
@@ -49,6 +53,8 @@ export const CreateFieldsRow: FunctionComponent<CreateFieldsRowProps> = ({
           <CreateFieldsRowField
             key={field}
             selectedOrg={selectedOrg}
+            selectedSObjects={selectedSObjects}
+            rows={rows}
             id={`field-${rowIdx}-${field}`}
             fieldDefinitions={fieldDefinitions}
             field={fieldDefinitions[field]}
@@ -76,6 +82,8 @@ export const CreateFieldsRow: FunctionComponent<CreateFieldsRowProps> = ({
             <CreateFieldsRowField
               key={field}
               selectedOrg={selectedOrg}
+              selectedSObjects={selectedSObjects}
+              rows={rows}
               id={`field-${rowIdx}-${field}`}
               fieldDefinitions={fieldDefinitions}
               field={fieldDefinitions[field]}
@@ -90,6 +98,8 @@ export const CreateFieldsRow: FunctionComponent<CreateFieldsRowProps> = ({
           <CreateFieldsRowField
             key={field}
             selectedOrg={selectedOrg}
+            selectedSObjects={selectedSObjects}
+            rows={rows}
             id={`field-${rowIdx}-${field}`}
             fieldDefinitions={fieldDefinitions}
             field={fieldDefinitions[field]}
diff --git a/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRowField.tsx b/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRowField.tsx
index 4a4046258..d104297dc 100644
--- a/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRowField.tsx
+++ b/apps/jetstream/src/app/components/create-object-and-fields/CreateFieldsRowField.tsx
@@ -1,30 +1,33 @@
 import { css } from '@emotion/react';
 import { ListItem, SalesforceOrgUi } from '@jetstream/types';
 import { Checkbox, ComboboxWithItems, Grid, Icon, Input, Radio, RadioGroup, Spinner, Textarea, Tooltip } from '@jetstream/ui';
-import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import {
   FieldDefinition,
   FieldDefinitions,
   FieldValue,
-  FieldValues,
   FieldValueState,
+  FieldValues,
   SalesforceFieldType,
 } from '../shared/create-fields/create-fields-types';
+import CreateFieldsFormulaEditor from './CreateFieldsFormulaEditor';
 
 export interface CreateFieldsRowFieldProps {
   selectedOrg: SalesforceOrgUi;
   id: string;
+  selectedSObjects: string[];
   fieldDefinitions: FieldDefinitions; // TODO: unused, remove
   field: FieldDefinition;
   allValues: FieldValues;
   valueState: FieldValueState;
   disabled: boolean;
+  rows: FieldValues[];
   onChange: (value: FieldValue) => void;
   onBlur: () => void;
 }
 
 export const CreateFieldsRowField = forwardRef<any, CreateFieldsRowFieldProps>(
-  ({ selectedOrg, id, field, allValues, valueState, disabled: _disabled, onChange, onBlur }, ref) => {
+  ({ selectedOrg, id, selectedSObjects, field, allValues, valueState, disabled: _disabled, rows, onChange, onBlur }, ref) => {
     const { value, touched, errorMessage } = valueState;
     const disabled = _disabled || field?.disabled?.(allValues);
     const [values, setValues] = useState<ListItem[]>([]);
@@ -196,6 +199,29 @@ export const CreateFieldsRowField = forwardRef<any, CreateFieldsRowFieldProps>(
             </Textarea>
           </div>
         );
+      case 'textarea-with-formula':
+        return (
+          <div
+            className="slds-m-right_medium slds-is-relative"
+            css={css`
+              max-width: 250px;
+            `}
+          >
+            {loadingValues && <Spinner size="small" />}
+            <CreateFieldsFormulaEditor
+              id={id}
+              selectedSObjects={selectedSObjects}
+              disabled={disabled}
+              rows={rows}
+              selectedOrg={selectedOrg}
+              allValues={allValues}
+              field={field}
+              valueState={valueState}
+              onChange={onChange}
+              onBlur={onBlur}
+            />
+          </div>
+        );
       case 'text':
       default:
         return (
diff --git a/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluator.tsx b/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluator.tsx
index 6898f8449..969fcead2 100644
--- a/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluator.tsx
+++ b/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluator.tsx
@@ -17,7 +17,6 @@ import {
   Radio,
   RadioButton,
   RadioGroup,
-  ScopedNotification,
   SobjectCombobox,
   SobjectComboboxRef,
   SobjectFieldCombobox,
@@ -33,12 +32,13 @@ import { FunctionComponent, useCallback, useEffect, useRef, useState } from 'rea
 import { useRecoilState, useRecoilValue } from 'recoil';
 import { applicationCookieState, selectedOrgState } from '../../app-state';
 import { useAmplitude } from '../core/analytics';
-import FormulaEvaluatorRecordSearch from './FormulaEvaluatorRecordSearch';
-import FormulaEvaluatorUserSearch from './FormulaEvaluatorUserSearch';
+import FormulaEvaluatorRecordSearch from '../shared/formula-evaluator/FormulaEvaluatorRecordSearch';
+import FormulaEvaluatorResults from '../shared/formula-evaluator/FormulaEvaluatorResults';
+import FormulaEvaluatorUserSearch from '../shared/formula-evaluator/FormulaEvaluatorUserSearch';
+import { getFormulaData } from '../shared/formula-evaluator/formula-evaluator.utils';
 import FormulaEvaluatorDeployModal from './deploy/FormulaEvaluatorDeployModal';
 import { registerCompletions } from './formula-evaluator.editor-utils';
 import * as fromFormulaState from './formula-evaluator.state';
-import { getFormulaData } from './formula-evaluator.utils';
 
 // Lazy import
 const prettier = import('prettier/standalone');
@@ -439,7 +439,6 @@ export const FormulaEvaluator: FunctionComponent<FormulaEvaluatorProps> = () =>
               }
             >
               {loading && <Spinner />}
-
               <FormulaEvaluatorRecordSearch
                 selectedOrg={selectedOrg}
                 selectedSObject={selectedSObject?.name || ''}
@@ -447,46 +446,7 @@ export const FormulaEvaluator: FunctionComponent<FormulaEvaluatorProps> = () =>
                 fieldErrorMessage={fieldErrorMessage}
                 onSelectedRecord={setRecordId}
               />
-              {errorMessage && (
-                <div className="slds-m-around-medium">
-                  <ScopedNotification theme="error" className="slds-m-top_medium">
-                    {errorMessage}
-                  </ScopedNotification>
-                </div>
-              )}
-              {results && (
-                <Grid vertical>
-                  {!!Object.keys(results.formulaFields).length && (
-                    <>
-                      <div className="slds-text-heading_small">Record Fields</div>
-                      <div className="slds-m-top_xx-small slds-m-bottom_small slds-p-left_small">
-                        {Object.keys(results.formulaFields).map((field) => {
-                          const { value } = results.formulaFields[field];
-                          return (
-                            <div key={field}>
-                              <span className="text-bold">{field}</span>: {String(value) || '<blank>'}
-                            </div>
-                          );
-                        })}
-                      </div>
-                    </>
-                  )}
-                  <div className="slds-text-heading_small">Formula Results</div>
-                  <div className="slds-m-top_xx-small slds-m-bottom_small slds-p-left_small">
-                    {results.parsedFormula.type === 'error' ? (
-                      <Grid vertical className="slds-text-color_error">
-                        <div>{results.parsedFormula.errorType}</div>
-                        <div>{results.parsedFormula.message}</div>
-                        {results.parsedFormula.errorType === 'NotImplementedError' && results.parsedFormula.name === 'isnull' && (
-                          <div>Use ISBLANK instead</div>
-                        )}
-                      </Grid>
-                    ) : (
-                      <div className="slds-text-color_success">{String(results.parsedFormula.value)}</div>
-                    )}
-                  </div>
-                </Grid>
-              )}
+              <FormulaEvaluatorResults errorMessage={errorMessage} results={results} />
               {!errorMessage && !results && (
                 <EmptyState
                   headline="Test out a formula, the results will be shown here"
diff --git a/apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.editor-utils.ts b/apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.editor-utils.ts
index 509d14ccc..8a614c065 100644
--- a/apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.editor-utils.ts
+++ b/apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.editor-utils.ts
@@ -1,7 +1,7 @@
 import { logger } from '@jetstream/shared/client-logger';
 import { describeGlobal, describeSObject, manualRequest, queryAllWithCache } from '@jetstream/shared/data';
 import { SalesforceOrgUi } from '@jetstream/types';
-import type { DescribeSObjectResult } from 'jsforce';
+import type { DescribeSObjectResult, Field } from 'jsforce';
 import type * as monaco from 'monaco-editor';
 import { composeQuery, getField } from 'soql-parser-js';
 import { CharacterInfo, CustomPermission, ExternalString, SpecialWordType } from './formula-evaluator.types';
@@ -27,7 +27,12 @@ const triggerChars = 'adefhijlmnsu';
  * Register completions only for fields
  * Formula completions are registered in monaco-sfdx-formula-completions since these are known ahead of time
  */
-export async function registerCompletions(monaco: Monaco, selectedOrg: SalesforceOrgUi, sobject?: string) {
+export async function registerCompletions(
+  monaco: Monaco,
+  selectedOrg: SalesforceOrgUi,
+  sobject?: string,
+  additionalFields?: Partial<Field>[]
+) {
   if (priorCompletion) {
     priorCompletion.dispose();
   }
@@ -38,7 +43,7 @@ export async function registerCompletions(monaco: Monaco, selectedOrg: Salesforc
       provideCompletionItems: async (model, position, context, token) => {
         const characterInfo = getCharacterInfo(model, position);
         return {
-          suggestions: await fetchCompletions(monaco, characterInfo, selectedOrg, sobject),
+          suggestions: await fetchCompletions(monaco, characterInfo, selectedOrg, sobject, additionalFields),
         };
       },
     });
@@ -90,7 +95,8 @@ async function fetchCompletions(
   monaco: Monaco,
   characterInfo: CharacterInfo,
   selectedOrg: SalesforceOrgUi,
-  sobject?: string
+  sobject?: string,
+  additionalFields?: Partial<Field>[]
 ): Promise<monaco.languages.CompletionItem[]> {
   const { textUntilPosition: textUntilPositionAll, mostRecentCharacter, range } = characterInfo;
   // if spaces, ignore prior words - e.x. "Log__r.ApiVersion__c != LoggedBy__r" we only care about LoggedBy__r
@@ -106,7 +112,7 @@ async function fetchCompletions(
     }
   }
 
-  let currentSObjectMeta: DescribeSObjectResult;
+  let currentSObjectMeta: Omit<DescribeSObjectResult, 'fields'> & { fields: Partial<Field>[] };
 
   /**
    * Handle all special words (starts with `$`)
@@ -221,7 +227,10 @@ async function fetchCompletions(
    */
   const { data } = await describeSObject(selectedOrg, sobject);
   // Current object metadata - will be changed when fetching related object metadata
-  currentSObjectMeta = data;
+  currentSObjectMeta = {
+    ...data,
+    fields: [...data.fields, ...(additionalFields || [])],
+  };
   // If true, then special keywords will be included in results
   let isRootObject = true;
   // Completions are added to the list
@@ -265,7 +274,7 @@ async function fetchCompletions(
       detail: field.type,
       filterText: field.name,
       kind: monaco.languages.CompletionItemKind.Class,
-      insertText: field.name,
+      insertText: field.name!,
       range,
     });
     if (!!field.relationshipName && !!field.referenceTo?.length) {
diff --git a/apps/jetstream/src/app/components/shared/create-fields/create-fields-types.ts b/apps/jetstream/src/app/components/shared/create-fields/create-fields-types.ts
index 8ea06414b..6c7258358 100644
--- a/apps/jetstream/src/app/components/shared/create-fields/create-fields-types.ts
+++ b/apps/jetstream/src/app/components/shared/create-fields/create-fields-types.ts
@@ -65,7 +65,7 @@ export type SalesforceFieldType =
   | 'LongTextArea'
   | 'Html';
 
-export type FieldDefinitionUiType = 'picklist' | 'text' | 'textarea' | 'radio' | 'checkbox';
+export type FieldDefinitionUiType = 'picklist' | 'text' | 'textarea' | 'textarea-with-formula' | 'radio' | 'checkbox';
 
 export interface FieldValueState {
   value: FieldValue;
diff --git a/apps/jetstream/src/app/components/shared/create-fields/create-fields-utils.tsx b/apps/jetstream/src/app/components/shared/create-fields/create-fields-utils.tsx
index 3e6fb6cc1..86fec41b0 100644
--- a/apps/jetstream/src/app/components/shared/create-fields/create-fields-utils.tsx
+++ b/apps/jetstream/src/app/components/shared/create-fields/create-fields-utils.tsx
@@ -301,7 +301,7 @@ export const fieldDefinitions: FieldDefinitions = {
   },
   formula: {
     label: 'Formula',
-    type: 'textarea',
+    type: 'textarea-with-formula',
     required: true,
     // TODO: would be cool to have syntax highlighting
   },
diff --git a/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluatorRecordSearch.tsx b/apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorRecordSearch.tsx
similarity index 97%
rename from apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluatorRecordSearch.tsx
rename to apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorRecordSearch.tsx
index 185d9578b..83d302879 100644
--- a/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluatorRecordSearch.tsx
+++ b/apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorRecordSearch.tsx
@@ -4,8 +4,8 @@ import { CloneEditView, ListItem, Maybe, SalesforceOrgUi } from '@jetstream/type
 import { ComboboxWithItemsTypeAhead, Grid, Icon, Tooltip } from '@jetstream/ui';
 import { FunctionComponent, useCallback, useRef, useState } from 'react';
 import { useRecoilState } from 'recoil';
-import { applicationCookieState } from '../../app-state';
-import ViewEditCloneRecord from '../core/ViewEditCloneRecord';
+import { applicationCookieState } from '../../../app-state';
+import ViewEditCloneRecord from '../../core/ViewEditCloneRecord';
 
 export interface FormulaEvaluatorRecordSearchProps {
   selectedOrg: SalesforceOrgUi;
diff --git a/apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorResults.tsx b/apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorResults.tsx
new file mode 100644
index 000000000..66bbd0372
--- /dev/null
+++ b/apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorResults.tsx
@@ -0,0 +1,61 @@
+import { Maybe } from '@jetstream/types';
+import { Grid, ScopedNotification } from '@jetstream/ui';
+import * as formulon from 'formulon';
+import { FunctionComponent } from 'react';
+
+export interface FormulaEvaluatorResultsProps {
+  errorMessage?: Maybe<string>;
+  results: {
+    formulaFields: formulon.FormulaData;
+    parsedFormula: formulon.FormulaResult;
+  } | null;
+}
+
+export const FormulaEvaluatorResults: FunctionComponent<FormulaEvaluatorResultsProps> = ({ errorMessage, results }) => {
+  return (
+    <>
+      {errorMessage && (
+        <div className="slds-m-around-medium">
+          <ScopedNotification theme="error" className="slds-m-top_medium">
+            {errorMessage}
+          </ScopedNotification>
+        </div>
+      )}
+      {results && (
+        <Grid vertical>
+          {!!Object.keys(results.formulaFields).length && (
+            <>
+              <div className="slds-text-heading_small">Record Fields</div>
+              <div className="slds-m-top_xx-small slds-m-bottom_small slds-p-left_small">
+                {Object.keys(results.formulaFields).map((field) => {
+                  const { value } = results.formulaFields[field];
+                  return (
+                    <div key={field}>
+                      <span className="text-bold">{field}</span>: {String(value) || '<blank>'}
+                    </div>
+                  );
+                })}
+              </div>
+            </>
+          )}
+          <div className="slds-text-heading_small">Formula Results</div>
+          <div className="slds-m-top_xx-small slds-m-bottom_small slds-p-left_small">
+            {results.parsedFormula.type === 'error' ? (
+              <Grid vertical className="slds-text-color_error">
+                <div>{results.parsedFormula.errorType}</div>
+                <div>{results.parsedFormula.message}</div>
+                {results.parsedFormula.errorType === 'NotImplementedError' && results.parsedFormula.name === 'isnull' && (
+                  <div>Use ISBLANK instead</div>
+                )}
+              </Grid>
+            ) : (
+              <div className="slds-text-color_success">{String(results.parsedFormula.value)}</div>
+            )}
+          </div>
+        </Grid>
+      )}
+    </>
+  );
+};
+
+export default FormulaEvaluatorResults;
diff --git a/apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluatorUserSearch.tsx b/apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorUserSearch.tsx
similarity index 100%
rename from apps/jetstream/src/app/components/formula-evaluator/FormulaEvaluatorUserSearch.tsx
rename to apps/jetstream/src/app/components/shared/formula-evaluator/FormulaEvaluatorUserSearch.tsx
diff --git a/apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.utils.ts b/apps/jetstream/src/app/components/shared/formula-evaluator/formula-evaluator.utils.ts
similarity index 93%
rename from apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.utils.ts
rename to apps/jetstream/src/app/components/shared/formula-evaluator/formula-evaluator.utils.ts
index 11bdb03cf..0b27ab4c5 100644
--- a/apps/jetstream/src/app/components/formula-evaluator/formula-evaluator.utils.ts
+++ b/apps/jetstream/src/app/components/shared/formula-evaluator/formula-evaluator.utils.ts
@@ -11,9 +11,9 @@ import type { Field } from 'jsforce';
 import lodashGet from 'lodash/get';
 import isNil from 'lodash/isNil';
 import { composeQuery, getField } from 'soql-parser-js';
-import { fetchMetadataFromSoql } from '../query/utils/query-soql-utils';
-import { NullNumberBehavior } from './formula-evaluator.state';
-import { FormulaFieldsByType } from './formula-evaluator.types';
+import { NullNumberBehavior } from '../../formula-evaluator/formula-evaluator.state';
+import { FormulaFieldsByType } from '../../formula-evaluator/formula-evaluator.types';
+import { fetchMetadataFromSoql } from '../../query/utils/query-soql-utils';
 
 const MATCH_FORMULA_SPECIAL_LABEL = /^\$[a-zA-Z]+\./;
 
@@ -149,21 +149,37 @@ function getPrecision(a) {
   return p;
 }
 
+interface FormulaDataProps {
+  selectedOrg: SalesforceOrgUi;
+  selectedUserId: string;
+  /**
+   * Fields used in formula, used to query records
+   */
+  fields: string[];
+  /**
+   * If the formula is testing fields the do not yet exist, they can be included here
+   */
+  syntheticFields?: Record<
+    string,
+    {
+      name: string;
+      value?: any;
+    }
+  >;
+  recordId: string;
+  sobjectName: string;
+  numberNullBehavior: NullNumberBehavior;
+}
+
 export async function getFormulaData({
   selectedOrg,
   selectedUserId,
   fields,
+  syntheticFields,
   recordId,
   sobjectName,
   numberNullBehavior = 'ZERO',
-}: {
-  selectedOrg: SalesforceOrgUi;
-  selectedUserId: string;
-  fields: string[];
-  recordId: string;
-  sobjectName: string;
-  numberNullBehavior: NullNumberBehavior;
-}): Promise<
+}: FormulaDataProps): Promise<
   | { type: 'error'; message: string }
   | { type: 'success'; formulaFields: formulon.FormulaData; warnings: { type: string; message: string }[] }
 > {
@@ -269,6 +285,7 @@ export async function getFormulaData({
 async function collectBaseRecordFields({
   selectedOrg,
   fields,
+  syntheticFields,
   recordId,
   sobjectName,
   formulaFields,
@@ -276,6 +293,13 @@ async function collectBaseRecordFields({
 }: {
   selectedOrg: SalesforceOrgUi;
   fields: string[];
+  syntheticFields?: Record<
+    string,
+    {
+      name: string;
+      value?: any;
+    }
+  >;
   recordId: string;
   sobjectName: string;
   formulaFields: formulon.FormulaData;
@@ -284,6 +308,7 @@ async function collectBaseRecordFields({
   if (!fields.length) {
     return;
   }
+
   const { queryResults, columns, parsedQuery } = await query(
     selectedOrg,
     composeQuery({
@@ -325,6 +350,39 @@ async function collectBaseRecordFields({
   });
 }
 
+// TODO: Figure out how to handle synthetic fields
+// async function collectSyntheticRecordFields({
+//   fields,
+//   recordId,
+//   sobjectName,
+//   formulaFields,
+//   numberNullBehavior,
+// }: {
+//   fields: Record<string, {
+//     name: string;
+//     value?: any;
+//   }>;
+//   recordId: string;
+//   sobjectName: string;
+//   formulaFields: formulon.FormulaData;
+//   numberNullBehavior: NullNumberBehavior;
+// }) {
+
+//   Object.entries(fields).forEach(([field, value]) => {
+//     // Prefer to get field from actual metadata, otherwise picklist is not handled and can cause formula errors
+//     const column = lowercaseFieldMap[field.toLowerCase()] || fieldsByName[field.toLowerCase()];
+//     if (!column || !fieldsByName[field.toLowerCase()]) {
+//       throw new Error(`Field ${field} does not exist on ${sobjectName}.`);
+//     }
+//     formulaFields['Id'] = { type: 'literal', dataType: 'text', value: recordId, options: { length: 18 } };
+//     formulaFields[field] = getFormulonData(
+//       column,
+//       lodashGet(queryResults.records[0], fieldsByName[field.toLowerCase()].columnFullPath),
+//       numberNullBehavior
+//     );
+//   });
+// }
+
 function collectApiFields({
   selectedOrg,
   fields,