diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
index 1c39e19505..29babefcd9 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
@@ -5,6 +5,7 @@
 </script>
 
 <div class="uk-margin block-field">
+  <label class="uk-form-label">Model</label>
   <div class="uk-form-controls">
     <select class="budibase__input" bind:value>
       {#each $backendUiStore.models as model}
diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
index e69de29bb2..125ef2436e 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
@@ -0,0 +1,33 @@
+<script>
+  import { backendUiStore } from "builderStore"
+
+  export let value
+</script>
+
+<div class="uk-margin block-field">
+  <div class="uk-form-controls">
+    <select class="budibase__input" bind:value={value.model}>
+      {#each $backendUiStore.models as model}
+        <option value={model}>{model.name}</option>
+      {/each}
+    </select>
+  </div>
+</div>
+
+{#if value.model}
+  <div class="uk-margin block-field">
+    <label class="uk-form-label fields">Fields</label>
+    {#each Object.keys(value.model.schema) as field}
+      <div class="uk-form-controls uk-margin">
+        <label class="uk-form-label">{field}</label>
+        <input type="text" class="budibase__input" bind:value={value[field]} />
+      </div>
+    {/each}
+  </div>
+{/if}
+
+<style>
+  .fields {
+    font-weight: 500;
+  }
+</style>
diff --git a/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte b/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte
index d629630099..08bf2d72db 100644
--- a/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/WorkflowBlockSetup.svelte
@@ -2,6 +2,7 @@
   import { backendUiStore, store } from "builderStore"
   import ComponentSelector from "./ParamInputs/ComponentSelector.svelte"
   import ModelSelector from "./ParamInputs/ModelSelector.svelte"
+  import RecordSelector from "./ParamInputs/RecordSelector.svelte"
 
   export let workflowBlock
 
@@ -51,6 +52,8 @@
           bind:value={workflowBlock.args[parameter]} />
       {:else if type === 'model'}
         <ModelSelector bind:value={workflowBlock.args[parameter]} />
+      {:else if type === 'record'}
+        <RecordSelector bind:value={workflowBlock.args[parameter]} />
       {:else if type === 'string'}
         <input
           type="text"
diff --git a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte
index 0907efe7ae..739e3e8b5c 100644
--- a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte
+++ b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/WorkflowBlock.svelte
@@ -8,7 +8,7 @@
   function addBlockToWorkflow() {
     workflowStore.actions.addBlockToWorkflow({
       ...blockDefinition,
-      args: {},
+      args: blockDefinition.args || {},
       actionId,
       type: blockType,
     })
diff --git a/packages/builder/src/components/workflow/WorkflowPanel/blockDefinitions.js b/packages/builder/src/components/workflow/WorkflowPanel/blockDefinitions.js
index 96da6a3910..d3b19d1e00 100644
--- a/packages/builder/src/components/workflow/WorkflowPanel/blockDefinitions.js
+++ b/packages/builder/src/components/workflow/WorkflowPanel/blockDefinitions.js
@@ -22,26 +22,33 @@ const ACTION = {
   },
   SAVE_RECORD: {
     name: "Save Record",
-    tagline: "Save a <b>{{model.name}}</b> record",
+    tagline: "<b>Save</b> a <b>{{record.model.name}}</b> record",
     icon: "ri-save-3-fill",
     description: "Save a record to your database.",
     environment: "SERVER",
     params: {
-      model: "model",
+      record: "record",
+    },
+    args: {
+      record: {},
     },
   },
   DELETE_RECORD: {
     description: "Delete a record from your database.",
     icon: "ri-delete-bin-line",
     name: "Delete Record",
-    tagline: "Delete a <b>{{model.name}}</b> record",
+    tagline: "<b>Delete</b> a <b>{{record.model.name}}</b> record",
     environment: "SERVER",
     params: {
-      record: "string",
+      record: "record",
+    },
+    args: {
+      record: {},
     },
   },
   FIND_RECORD: {
     description: "Find a record in your database.",
+    tagline: "<b>Find</b> a <b>{{record.model.name}}</b> record",
     icon: "ri-search-line",
     name: "Find Record",
     environment: "SERVER",
diff --git a/packages/client/src/state/setState.js b/packages/client/src/state/setState.js
index ad25b631d5..ac17b1a681 100644
--- a/packages/client/src/state/setState.js
+++ b/packages/client/src/state/setState.js
@@ -8,4 +8,4 @@ export const setState = (path, value) => {
     state = set(path, value, state)
     return state
   })
-}
\ No newline at end of file
+}
diff --git a/packages/client/src/state/stateManager.js b/packages/client/src/state/stateManager.js
index 5d32f5a486..5dd0d9957d 100644
--- a/packages/client/src/state/stateManager.js
+++ b/packages/client/src/state/stateManager.js
@@ -33,7 +33,7 @@ export const createStateManager = ({
   const getCurrentState = () => currentState
 
   const bb = bbFactory({
-  store: appStore,
+    store: appStore,
     getCurrentState,
     frontendDefinition,
     componentLibraries,
@@ -65,7 +65,7 @@ const _setup = ({ handlerTypes, getCurrentState, bb, store }) => node => {
     const isBound = typeof propValue === "string" && propValue.startsWith("{{")
 
     if (isBound) {
-      console.log("NODE IS BOUND", node);
+      console.log("NODE IS BOUND", node)
       initialProps[propName] = mustache.render(propValue, {
         state: currentStoreState,
         context,