diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/BatchEditMixTools.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/BatchEditMixTools.tsx
index 29a7080f76c..614fc880d5d 100644
--- a/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/BatchEditMixTools.tsx
+++ b/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/BatchEditMixTools.tsx
@@ -1,3 +1,192 @@
-export function BatchEditMixTools(): JSX.Element {
-  return <div>Todo: wire this up</div>
+import { useTranslation } from 'react-i18next'
+import { useState } from 'react'
+import {
+  DIRECTION_COLUMN,
+  Divider,
+  Flex,
+  SPACING,
+  StyledText,
+  Tabs,
+} from '@opentrons/components'
+import {
+  CheckboxExpandStepFormField,
+  InputStepFormField,
+} from '../../../../molecules'
+import {
+  BlowoutLocationField,
+  FlowRateField,
+  PositionField,
+  WellsOrderField,
+} from '../StepForm/PipetteFields'
+import {
+  getBlowoutLocationOptionsForForm,
+  getLabwareFieldForPositioningField,
+} from '../StepForm/utils'
+import type { WellOrderOption } from '../../../../form-types'
+import type { FieldPropsByName } from '../StepForm/types'
+
+interface BatchEditMixToolsProps {
+  propsForFields: FieldPropsByName
+}
+
+export function BatchEditMixTools(props: BatchEditMixToolsProps): JSX.Element {
+  const { propsForFields } = props
+  const { t, i18n } = useTranslation(['form', 'button', 'tooltip'])
+  const [tab, setTab] = useState<'aspirate' | 'dispense'>('aspirate')
+  const aspirateTab = {
+    text: i18n.format(t('aspirate'), 'capitalize'),
+    isActive: tab === 'aspirate',
+    onClick: () => {
+      setTab('aspirate')
+    },
+  }
+  const dispenseTab = {
+    text: i18n.format(t('dispense'), 'capitalize'),
+    isActive: tab === 'dispense',
+    onClick: () => {
+      setTab('dispense')
+    },
+  }
+
+  const getLabwareIdForPositioningField = (name: string): string | null => {
+    const labwareField = getLabwareFieldForPositioningField(name)
+    const labwareId = propsForFields[labwareField]?.value
+    return labwareId ? String(labwareId) : null
+  }
+
+  const getPipetteIdForForm = (): string | null => {
+    const pipetteId = propsForFields.pipette?.value
+    return pipetteId ? String(pipetteId) : null
+  }
+
+  const getWellOrderFieldValue = (
+    name: string
+  ): WellOrderOption | null | undefined => {
+    const val = propsForFields[name]?.value
+    if (val === 'l2r' || val === 'r2l' || val === 't2b' || val === 'b2t') {
+      return val
+    } else {
+      return null
+    }
+  }
+
+  return (
+    <Flex flexDirection={DIRECTION_COLUMN} width="100%">
+      <Flex padding={SPACING.spacing16}>
+        <Tabs tabs={[aspirateTab, dispenseTab]} />
+      </Flex>
+      <Divider marginY="0" />
+      <Flex padding={SPACING.spacing16} width="100%">
+        <FlowRateField
+          {...propsForFields[`${tab}_flowRate`]}
+          pipetteId={getPipetteIdForForm()}
+          flowRateType={tab}
+          volume={propsForFields.volume?.value ?? 0}
+          tiprack={propsForFields.tipRack.value}
+        />
+      </Flex>
+      <Divider marginY="0" />
+      {tab === 'aspirate' ? (
+        <>
+          <WellsOrderField
+            prefix={tab}
+            updateFirstWellOrder={
+              propsForFields.mix_wellOrder_first.updateValue
+            }
+            updateSecondWellOrder={
+              propsForFields.mix_wellOrder_second.updateValue
+            }
+            firstValue={getWellOrderFieldValue('mix_wellOrder_first')}
+            secondValue={getWellOrderFieldValue('mix_wellOrder_second')}
+            firstName="mix_wellOrder_first"
+            secondName="mix_wellOrder_second"
+          />
+          <Divider marginY="0" />
+          <PositionField
+            prefix="mix"
+            propsForFields={propsForFields}
+            zField="mix_mmFromBottom"
+            xField="mix_x_position"
+            yField="mix_y_position"
+            labwareId={getLabwareIdForPositioningField('mix_mmFromBottom')}
+          />
+          <Divider marginY="0" />
+        </>
+      ) : null}
+      <Flex
+        flexDirection={DIRECTION_COLUMN}
+        padding={SPACING.spacing12}
+        gridGap={SPACING.spacing8}
+      >
+        <StyledText desktopStyle="bodyDefaultSemiBold">
+          {t('protocol_steps:advanced_settings')}
+        </StyledText>
+        <CheckboxExpandStepFormField
+          title={i18n.format(
+            t('form:step_edit_form.field.delay.label'),
+            'capitalize'
+          )}
+          checkboxValue={propsForFields[`${tab}_delay_checkbox`].value}
+          isChecked={propsForFields[`${tab}_delay_checkbox`].value === true}
+          checkboxUpdateValue={
+            propsForFields[`${tab}_delay_checkbox`].updateValue
+          }
+        >
+          {propsForFields[`${tab}_delay_checkbox`].value === true ? (
+            <InputStepFormField
+              showTooltip={false}
+              padding="0"
+              title={t('protocol_steps:delay_duration')}
+              {...propsForFields[`${tab}_delay_seconds`]}
+              units={t('application:units.seconds')}
+            />
+          ) : null}
+        </CheckboxExpandStepFormField>
+        {tab === 'dispense' ? (
+          <>
+            <CheckboxExpandStepFormField
+              title={i18n.format(
+                t('form:step_edit_form.field.blowout.label'),
+                'capitalize'
+              )}
+              checkboxValue={propsForFields.blowout_checkbox.value}
+              isChecked={propsForFields.blowout_checkbox.value === true}
+              checkboxUpdateValue={propsForFields.blowout_checkbox.updateValue}
+            >
+              {propsForFields.blowout_checkbox.value === true ? (
+                <BlowoutLocationField
+                  {...propsForFields.blowout_location}
+                  options={getBlowoutLocationOptionsForForm({
+                    stepType: 'mix',
+                  })}
+                />
+              ) : null}
+            </CheckboxExpandStepFormField>
+            <CheckboxExpandStepFormField
+              title={i18n.format(
+                t('form:step_edit_form.field.touchTip.label'),
+                'capitalize'
+              )}
+              checkboxValue={propsForFields.mix_touchTip_checkbox.value}
+              isChecked={propsForFields.mix_touchTip_checkbox.value === true}
+              checkboxUpdateValue={
+                propsForFields.mix_touchTip_checkbox.updateValue
+              }
+            >
+              {propsForFields.mix_touchTip_checkbox.value === true ? (
+                <PositionField
+                  prefix="dispense"
+                  propsForFields={propsForFields}
+                  zField="mix_touchTip_mmFromBottom"
+                  labwareId={getLabwareIdForPositioningField(
+                    'mix_touchTip_mmFromBottom'
+                  )}
+                />
+              ) : null}
+            </CheckboxExpandStepFormField>
+          </>
+        ) : null}
+      </Flex>
+    </Flex>
+  )
 }
diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/index.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/index.tsx
index a2fe674db2e..81a6f259c95 100644
--- a/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/index.tsx
+++ b/protocol-designer/src/pages/Designer/ProtocolSteps/BatchEditToolbox/index.tsx
@@ -91,7 +91,7 @@ export const BatchEditToolbox = (): JSX.Element | null => {
           {stepType === 'moveLiquid' ? (
             <BatchEditMoveLiquidTools propsForFields={propsForFields} />
           ) : (
-            <BatchEditMixTools />
+            <BatchEditMixTools propsForFields={propsForFields} />
           )}
         </Toolbox>
       )
diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PositionField.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PositionField.tsx
index 720a273d1a2..5023dca0a3f 100644
--- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PositionField.tsx
+++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PositionField.tsx
@@ -26,7 +26,7 @@ import type {
 import type { FieldPropsByName } from '../types'
 import type { PositionSpecs } from '../../../../../components/StepEditForm/fields/TipPositionField/TipPositionModal'
 interface PositionFieldProps {
-  prefix: 'aspirate' | 'dispense'
+  prefix: 'aspirate' | 'dispense' | 'mix'
   propsForFields: FieldPropsByName
   zField: TipZOffsetFields
   xField?: TipXOffsetFields
diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MixTools/index.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MixTools/index.tsx
index d1e27f8d0ac..b9781a92118 100644
--- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MixTools/index.tsx
+++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MixTools/index.tsx
@@ -1,24 +1,44 @@
 import { useSelector } from 'react-redux'
 import { useTranslation } from 'react-i18next'
-import { DIRECTION_COLUMN, Divider, Flex } from '@opentrons/components'
-import { InputStepFormField } from '../../../../../../molecules'
+import { useState } from 'react'
+import {
+  DIRECTION_COLUMN,
+  Divider,
+  Flex,
+  SPACING,
+  StyledText,
+  Tabs,
+} from '@opentrons/components'
+import {
+  CheckboxExpandStepFormField,
+  InputStepFormField,
+} from '../../../../../../molecules'
 import {
   getLabwareEntities,
   getPipetteEntities,
 } from '../../../../../../step-forms/selectors'
 import { getEnableReturnTip } from '../../../../../../feature-flags/selectors'
 import {
+  BlowoutLocationField,
+  BlowoutOffsetField,
   ChangeTipField,
   DropTipField,
+  FlowRateField,
   LabwareField,
   PartialTipField,
   PickUpTipField,
   PipetteField,
+  PositionField,
   TipWellSelectionField,
   TiprackField,
   VolumeField,
   WellSelectionField,
+  WellsOrderField,
 } from '../../PipetteFields'
+import {
+  getBlowoutLocationOptionsForForm,
+  getLabwareFieldForPositioningField,
+} from '../../utils'
 import type { StepFormProps } from '../../types'
 
 export function MixTools(props: StepFormProps): JSX.Element {
@@ -26,7 +46,23 @@ export function MixTools(props: StepFormProps): JSX.Element {
   const pipettes = useSelector(getPipetteEntities)
   const enableReturnTip = useSelector(getEnableReturnTip)
   const labwares = useSelector(getLabwareEntities)
-  const { t } = useTranslation(['application', 'form'])
+  const [tab, setTab] = useState<'aspirate' | 'dispense'>('aspirate')
+  const { t, i18n } = useTranslation(['application', 'form'])
+  const aspirateTab = {
+    text: i18n.format(t('aspirate'), 'capitalize'),
+    isActive: tab === 'aspirate',
+    onClick: () => {
+      setTab('aspirate')
+    },
+  }
+  const dispenseTab = {
+    text: i18n.format(t('dispense'), 'capitalize'),
+
+    isActive: tab === 'dispense',
+    onClick: () => {
+      setTab('dispense')
+    },
+  }
   const is96Channel =
     propsForFields.pipette.value != null &&
     pipettes[String(propsForFields.pipette.value)].name === 'p1000_96'
@@ -102,6 +138,145 @@ export function MixTools(props: StepFormProps): JSX.Element {
       ) : null}
     </Flex>
   ) : (
-    <div>wire this up</div>
+    <Flex flexDirection={DIRECTION_COLUMN} width="100%">
+      <Flex padding={SPACING.spacing16}>
+        <Tabs tabs={[aspirateTab, dispenseTab]} />
+      </Flex>
+      <Divider marginY="0" />
+      <Flex padding={SPACING.spacing16} width="100%">
+        <FlowRateField
+          {...propsForFields[`${tab}_flowRate`]}
+          pipetteId={formData.pipette}
+          flowRateType={tab}
+          volume={propsForFields.volume?.value ?? 0}
+          tiprack={propsForFields.tipRack.value}
+        />
+      </Flex>
+      <Divider marginY="0" />
+      {tab === 'aspirate' ? (
+        <>
+          <WellsOrderField
+            prefix={tab}
+            updateFirstWellOrder={
+              propsForFields.mix_wellOrder_first.updateValue
+            }
+            updateSecondWellOrder={
+              propsForFields.mix_wellOrder_second.updateValue
+            }
+            firstValue={formData.mix_wellOrder_first}
+            secondValue={formData.mix_wellOrder_second}
+            firstName={'mix_wellOrder_first'}
+            secondName={'mix_wellOrder_second'}
+          />
+          <Divider marginY="0" />
+          <PositionField
+            prefix="mix"
+            propsForFields={propsForFields}
+            zField="mix_mmFromBottom"
+            xField="mix_x_position"
+            yField="mix_y_position"
+            labwareId={
+              formData[getLabwareFieldForPositioningField('mix_mmFromBottom')]
+            }
+          />
+          <Divider marginY="0" />
+        </>
+      ) : null}
+      <Flex
+        flexDirection={DIRECTION_COLUMN}
+        padding={SPACING.spacing12}
+        gridGap={SPACING.spacing8}
+      >
+        <StyledText desktopStyle="bodyDefaultSemiBold">
+          {t('protocol_steps:advanced_settings')}
+        </StyledText>
+        <CheckboxExpandStepFormField
+          title={i18n.format(
+            t('form:step_edit_form.field.delay.label'),
+            'capitalize'
+          )}
+          checkboxValue={propsForFields[`${tab}_delay_checkbox`].value}
+          isChecked={propsForFields[`${tab}_delay_checkbox`].value === true}
+          checkboxUpdateValue={
+            propsForFields[`${tab}_delay_checkbox`].updateValue
+          }
+        >
+          {formData[`${tab}_delay_checkbox`] === true ? (
+            <InputStepFormField
+              showTooltip={false}
+              padding="0"
+              title={t('protocol_steps:delay_duration')}
+              {...propsForFields[`${tab}_delay_seconds`]}
+              units={t('application:units.seconds')}
+            />
+          ) : null}
+        </CheckboxExpandStepFormField>
+        {tab === 'dispense' ? (
+          <>
+            <CheckboxExpandStepFormField
+              title={i18n.format(
+                t('form:step_edit_form.field.blowout.label'),
+                'capitalize'
+              )}
+              checkboxValue={propsForFields.blowout_checkbox.value}
+              isChecked={propsForFields.blowout_checkbox.value === true}
+              checkboxUpdateValue={propsForFields.blowout_checkbox.updateValue}
+            >
+              {formData.blowout_checkbox === true ? (
+                <Flex
+                  flexDirection={DIRECTION_COLUMN}
+                  gridGap={SPACING.spacing6}
+                >
+                  <BlowoutLocationField
+                    {...propsForFields.blowout_location}
+                    options={getBlowoutLocationOptionsForForm({
+                      stepType: formData.stepType,
+                    })}
+                  />
+                  <FlowRateField
+                    {...propsForFields.blowout_flowRate}
+                    pipetteId={formData.pipette}
+                    flowRateType="blowout"
+                    volume={propsForFields.volume?.value ?? 0}
+                    tiprack={propsForFields.tipRack.value}
+                  />
+                  <BlowoutOffsetField
+                    {...propsForFields.blowout_z_offset}
+                    destLabwareId={propsForFields.labware.value}
+                    blowoutLabwareId={propsForFields.blowout_location.value}
+                  />
+                </Flex>
+              ) : null}
+            </CheckboxExpandStepFormField>
+            <CheckboxExpandStepFormField
+              title={i18n.format(
+                t('form:step_edit_form.field.touchTip.label'),
+                'capitalize'
+              )}
+              checkboxValue={propsForFields.mix_touchTip_checkbox.value}
+              isChecked={propsForFields.mix_touchTip_checkbox.value === true}
+              checkboxUpdateValue={
+                propsForFields.mix_touchTip_checkbox.updateValue
+              }
+            >
+              {formData.mix_touchTip_checkbox === true ? (
+                <PositionField
+                  prefix={tab}
+                  propsForFields={propsForFields}
+                  zField="mix_touchTip_mmFromBottom"
+                  labwareId={
+                    formData[
+                      getLabwareFieldForPositioningField(
+                        'mix_touchTip_mmFromBottom'
+                      )
+                    ]
+                  }
+                />
+              ) : null}
+            </CheckboxExpandStepFormField>
+          </>
+        ) : null}
+      </Flex>
+    </Flex>
   )
 }
diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/TimelineToolbox.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/TimelineToolbox.tsx
index d51c4b5a9e1..76c5afa9540 100644
--- a/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/TimelineToolbox.tsx
+++ b/protocol-designer/src/pages/Designer/ProtocolSteps/Timeline/TimelineToolbox.tsx
@@ -29,8 +29,6 @@ export const TimelineToolbox = (): JSX.Element => {
   const { t } = useTranslation('protocol_steps')
   const orderedStepIds = useSelector(stepFormSelectors.getOrderedStepIds)
   const formData = useSelector(getUnsavedForm)
-  //  TODO: potentially add batch edit capabilities back in
-  // const isMultiSelectMode = useSelector(getIsMultiSelectMode)
   const dispatch = useDispatch<ThunkDispatch<any>>()
 
   const handleKeyDown: (e: KeyboardEvent) => void = e => {
@@ -70,8 +68,6 @@ export const TimelineToolbox = (): JSX.Element => {
       }
       confirmButton={formData != null ? undefined : <AddStepButton />}
     >
-      {/* todo(ja): this is for batch edit which we will need to add back in */}
-      {/* <MultiSelectToolbar isMultiSelectMode={Boolean(isMultiSelectMode)} /> */}
       <Flex
         flexDirection={DIRECTION_COLUMN}
         gridGap={SPACING.spacing4}