diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/AbstractRunScriptInput.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/AbstractRunScriptInput.java
new file mode 100644
index 00000000..f6d76a1f
--- /dev/null
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/AbstractRunScriptInput.java
@@ -0,0 +1,198 @@
+/*
+ * QQQ - Low-code Application Framework for Engineers.
+ * Copyright (C) 2021-2023.  Kingsrook, LLC
+ * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
+ * contact@kingsrook.com
+ * https://github.com/Kingsrook/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.kingsrook.qqq.backend.core.model.actions.scripts;
+
+
+import java.io.Serializable;
+import java.util.Map;
+import com.kingsrook.qqq.backend.core.actions.scripts.logging.QCodeExecutionLoggerInterface;
+import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
+import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
+
+
+/*******************************************************************************
+ ** Base class for input wrappers that end up running scripts (ExecuteCodeAction)
+ *******************************************************************************/
+public class AbstractRunScriptInput<C extends QCodeReference> extends AbstractTableActionInput
+{
+   private C                             codeReference;
+   private Map<String, Serializable>     inputValues;
+   private QCodeExecutionLoggerInterface logger;
+   private Serializable                  outputObject;
+   private Serializable                  scriptUtils;
+
+
+
+   /*******************************************************************************
+    ** Getter for codeReference
+    *******************************************************************************/
+   public C getCodeReference()
+   {
+      return (this.codeReference);
+   }
+
+
+
+   /*******************************************************************************
+    ** Setter for codeReference
+    *******************************************************************************/
+   public void setCodeReference(C codeReference)
+   {
+      this.codeReference = codeReference;
+   }
+
+
+
+   /*******************************************************************************
+    ** Fluent setter for codeReference
+    *******************************************************************************/
+   public AbstractRunScriptInput<C> withCodeReference(C codeReference)
+   {
+      this.codeReference = codeReference;
+      return (this);
+   }
+
+
+
+   /*******************************************************************************
+    ** Getter for inputValues
+    *******************************************************************************/
+   public Map<String, Serializable> getInputValues()
+   {
+      return (this.inputValues);
+   }
+
+
+
+   /*******************************************************************************
+    ** Setter for inputValues
+    *******************************************************************************/
+   public void setInputValues(Map<String, Serializable> inputValues)
+   {
+      this.inputValues = inputValues;
+   }
+
+
+
+   /*******************************************************************************
+    ** Fluent setter for inputValues
+    *******************************************************************************/
+   public AbstractRunScriptInput<C> withInputValues(Map<String, Serializable> inputValues)
+   {
+      this.inputValues = inputValues;
+      return (this);
+   }
+
+
+
+   /*******************************************************************************
+    ** Getter for logger
+    *******************************************************************************/
+   public QCodeExecutionLoggerInterface getLogger()
+   {
+      return (this.logger);
+   }
+
+
+
+   /*******************************************************************************
+    ** Setter for logger
+    *******************************************************************************/
+   public void setLogger(QCodeExecutionLoggerInterface logger)
+   {
+      this.logger = logger;
+   }
+
+
+
+   /*******************************************************************************
+    ** Fluent setter for logger
+    *******************************************************************************/
+   public AbstractRunScriptInput<C> withLogger(QCodeExecutionLoggerInterface logger)
+   {
+      this.logger = logger;
+      return (this);
+   }
+
+
+
+   /*******************************************************************************
+    ** Getter for outputObject
+    *******************************************************************************/
+   public Serializable getOutputObject()
+   {
+      return (this.outputObject);
+   }
+
+
+
+   /*******************************************************************************
+    ** Setter for outputObject
+    *******************************************************************************/
+   public void setOutputObject(Serializable outputObject)
+   {
+      this.outputObject = outputObject;
+   }
+
+
+
+   /*******************************************************************************
+    ** Fluent setter for outputObject
+    *******************************************************************************/
+   public AbstractRunScriptInput<C> withOutputObject(Serializable outputObject)
+   {
+      this.outputObject = outputObject;
+      return (this);
+   }
+
+
+
+   /*******************************************************************************
+    ** Getter for scriptUtils
+    *******************************************************************************/
+   public Serializable getScriptUtils()
+   {
+      return (this.scriptUtils);
+   }
+
+
+
+   /*******************************************************************************
+    ** Setter for scriptUtils
+    *******************************************************************************/
+   public void setScriptUtils(Serializable scriptUtils)
+   {
+      this.scriptUtils = scriptUtils;
+   }
+
+
+
+   /*******************************************************************************
+    ** Fluent setter for scriptUtils
+    *******************************************************************************/
+   public AbstractRunScriptInput<C> withScriptUtils(Serializable scriptUtils)
+   {
+      this.scriptUtils = scriptUtils;
+      return (this);
+   }
+
+}
diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAdHocRecordScriptInput.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAdHocRecordScriptInput.java
index cf097f4f..f8191b57 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAdHocRecordScriptInput.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAdHocRecordScriptInput.java
@@ -24,9 +24,6 @@ package com.kingsrook.qqq.backend.core.model.actions.scripts;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
-import com.kingsrook.qqq.backend.core.actions.scripts.logging.QCodeExecutionLoggerInterface;
-import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.metadata.code.AdHocScriptCodeReference;
 
@@ -34,18 +31,10 @@ import com.kingsrook.qqq.backend.core.model.metadata.code.AdHocScriptCodeReferen
 /*******************************************************************************
  **
  *******************************************************************************/
-public class RunAdHocRecordScriptInput extends AbstractTableActionInput
+public class RunAdHocRecordScriptInput extends AbstractRunScriptInput<AdHocScriptCodeReference>
 {
-   private AdHocScriptCodeReference      codeReference;
-   private Map<String, Serializable>     inputValues;
-   private List<Serializable>            recordPrimaryKeyList; // can either supply recordList, or recordPrimaryKeyList
-   private List<QRecord>                 recordList;
-   private String                        tableName;
-   private QCodeExecutionLoggerInterface logger;
-
-   private Serializable outputObject;
-
-   private Serializable scriptUtils;
+   private List<Serializable> recordPrimaryKeyList; // can either supply recordList, or recordPrimaryKeyList
+   private List<QRecord>      recordList;
 
 
 
@@ -58,189 +47,6 @@ public class RunAdHocRecordScriptInput extends AbstractTableActionInput
 
 
 
-   /*******************************************************************************
-    ** Getter for inputValues
-    **
-    *******************************************************************************/
-   public Map<String, Serializable> getInputValues()
-   {
-      return inputValues;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for inputValues
-    **
-    *******************************************************************************/
-   public void setInputValues(Map<String, Serializable> inputValues)
-   {
-      this.inputValues = inputValues;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for inputValues
-    **
-    *******************************************************************************/
-   public RunAdHocRecordScriptInput withInputValues(Map<String, Serializable> inputValues)
-   {
-      this.inputValues = inputValues;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for outputObject
-    **
-    *******************************************************************************/
-   public Serializable getOutputObject()
-   {
-      return outputObject;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for outputObject
-    **
-    *******************************************************************************/
-   public void setOutputObject(Serializable outputObject)
-   {
-      this.outputObject = outputObject;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for outputObject
-    **
-    *******************************************************************************/
-   public RunAdHocRecordScriptInput withOutputObject(Serializable outputObject)
-   {
-      this.outputObject = outputObject;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for logger
-    *******************************************************************************/
-   public QCodeExecutionLoggerInterface getLogger()
-   {
-      return (this.logger);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for logger
-    *******************************************************************************/
-   public void setLogger(QCodeExecutionLoggerInterface logger)
-   {
-      this.logger = logger;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for logger
-    *******************************************************************************/
-   public RunAdHocRecordScriptInput withLogger(QCodeExecutionLoggerInterface logger)
-   {
-      this.logger = logger;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for scriptUtils
-    **
-    *******************************************************************************/
-   public Serializable getScriptUtils()
-   {
-      return scriptUtils;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for scriptUtils
-    **
-    *******************************************************************************/
-   public void setScriptUtils(Serializable scriptUtils)
-   {
-      this.scriptUtils = scriptUtils;
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for codeReference
-    *******************************************************************************/
-   public AdHocScriptCodeReference getCodeReference()
-   {
-      return (this.codeReference);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for codeReference
-    *******************************************************************************/
-   public void setCodeReference(AdHocScriptCodeReference codeReference)
-   {
-      this.codeReference = codeReference;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for codeReference
-    *******************************************************************************/
-   public RunAdHocRecordScriptInput withCodeReference(AdHocScriptCodeReference codeReference)
-   {
-      this.codeReference = codeReference;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for tableName
-    *******************************************************************************/
-   public String getTableName()
-   {
-      return (this.tableName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for tableName
-    *******************************************************************************/
-   public void setTableName(String tableName)
-   {
-      this.tableName = tableName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for tableName
-    *******************************************************************************/
-   public RunAdHocRecordScriptInput withTableName(String tableName)
-   {
-      this.tableName = tableName;
-      return (this);
-   }
-
-
-
    /*******************************************************************************
     ** Getter for recordList
     *******************************************************************************/
diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java
index 4da5c558..e1a51b21 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java
@@ -22,187 +22,13 @@
 package com.kingsrook.qqq.backend.core.model.actions.scripts;
 
 
-import java.io.Serializable;
-import java.util.Map;
-import com.kingsrook.qqq.backend.core.actions.scripts.logging.QCodeExecutionLoggerInterface;
-import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
 import com.kingsrook.qqq.backend.core.model.metadata.code.AssociatedScriptCodeReference;
 
 
 /*******************************************************************************
  **
  *******************************************************************************/
-public class RunAssociatedScriptInput extends AbstractTableActionInput
+public class RunAssociatedScriptInput extends AbstractRunScriptInput<AssociatedScriptCodeReference>
 {
-   private AssociatedScriptCodeReference codeReference;
-   private Map<String, Serializable>     inputValues;
-   private QCodeExecutionLoggerInterface logger;
 
-   private Serializable outputObject;
-
-   private Serializable scriptUtils;
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public RunAssociatedScriptInput()
-   {
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for codeReference
-    **
-    *******************************************************************************/
-   public AssociatedScriptCodeReference getCodeReference()
-   {
-      return codeReference;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for codeReference
-    **
-    *******************************************************************************/
-   public void setCodeReference(AssociatedScriptCodeReference codeReference)
-   {
-      this.codeReference = codeReference;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for codeReference
-    **
-    *******************************************************************************/
-   public RunAssociatedScriptInput withCodeReference(AssociatedScriptCodeReference codeReference)
-   {
-      this.codeReference = codeReference;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for inputValues
-    **
-    *******************************************************************************/
-   public Map<String, Serializable> getInputValues()
-   {
-      return inputValues;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for inputValues
-    **
-    *******************************************************************************/
-   public void setInputValues(Map<String, Serializable> inputValues)
-   {
-      this.inputValues = inputValues;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for inputValues
-    **
-    *******************************************************************************/
-   public RunAssociatedScriptInput withInputValues(Map<String, Serializable> inputValues)
-   {
-      this.inputValues = inputValues;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for outputObject
-    **
-    *******************************************************************************/
-   public Serializable getOutputObject()
-   {
-      return outputObject;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for outputObject
-    **
-    *******************************************************************************/
-   public void setOutputObject(Serializable outputObject)
-   {
-      this.outputObject = outputObject;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for outputObject
-    **
-    *******************************************************************************/
-   public RunAssociatedScriptInput withOutputObject(Serializable outputObject)
-   {
-      this.outputObject = outputObject;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for logger
-    *******************************************************************************/
-   public QCodeExecutionLoggerInterface getLogger()
-   {
-      return (this.logger);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for logger
-    *******************************************************************************/
-   public void setLogger(QCodeExecutionLoggerInterface logger)
-   {
-      this.logger = logger;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for logger
-    *******************************************************************************/
-   public RunAssociatedScriptInput withLogger(QCodeExecutionLoggerInterface logger)
-   {
-      this.logger = logger;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for scriptUtils
-    **
-    *******************************************************************************/
-   public Serializable getScriptUtils()
-   {
-      return scriptUtils;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for scriptUtils
-    **
-    *******************************************************************************/
-   public void setScriptUtils(Serializable scriptUtils)
-   {
-      this.scriptUtils = scriptUtils;
-   }
 }