diff --git a/package-lock.json b/package-lock.json
index 89e9671..3989513 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9677,6 +9677,20 @@
         }
       }
     },
+    "node_modules/vitest/node_modules/yaml": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      }
+    },
     "node_modules/vt-pbf": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
diff --git a/src/App.tsx b/src/App.tsx
index 2d9d509..bb65e9f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -5,6 +5,7 @@ import { Switch, Route } from "react-router-dom";
 import { BeamlineI24 } from "./routes/BeamlineI24";
 import { FixedTarget } from "./routes/FixedTarget";
 import { SerialNavBar } from "./components/SerialNavBar";
+import { Extruder } from "./routes/Extruder";
 
 function App() {
   const theme = useTheme();
@@ -27,6 +28,9 @@ function App() {
         <Route path="/fixed-target">
           <FixedTarget />
         </Route>
+        <Route path="/extruder">
+          <Extruder />
+        </Route>
       </Switch>
       <Footer
         logo={theme.logos?.short}
diff --git a/src/blueapi/BlueapiComponents.tsx b/src/blueapi/BlueapiComponents.tsx
index 864e5a7..0e40b1d 100644
--- a/src/blueapi/BlueapiComponents.tsx
+++ b/src/blueapi/BlueapiComponents.tsx
@@ -8,8 +8,7 @@ import {
   Tooltip,
   Typography,
 } from "@mui/material";
-import { forceString, ReadPvRawValue } from "../pv/util";
-import { RawValue } from "../pv/types";
+import { parseInstrumentSession, readVisitFromPv } from "./visit";
 
 type SeverityLevel = "success" | "info" | "warning" | "error";
 type VariantChoice = "outlined" | "contained";
@@ -37,43 +36,6 @@ type RunPlanButtonProps = {
 // This will be another PR
 // See https://github.com/DiamondLightSource/mx-daq-ui/issues/71
 
-/**
- * Read the full visit path from the visit PV set by the beamline staff.
- * @returns {string} the full visit pV /dls/i24/data/{year}/{visit}
- */
-export function readVisitFromPv(): string {
-  const fullVisitPath: RawValue = ReadPvRawValue({
-    label: "visit",
-    pv: "ca://BL24I-MO-IOC-13:GP100",
-  });
-  const visitString: string = forceString(fullVisitPath);
-  return visitString;
-}
-
-/**
- * Parse the full visit path and return only the instrument session.
- * An error will be raised if the instrument session value is undefined or
- * if the PV is not connected.
- * @param {string} visit The full visit path
- * @returns {string} Only the instrument session part of the visit path
- */
-export function parseInstrumentSession(visit: string): string {
-  let instrumentSession: string | undefined;
-  if (visit === "not connected" || visit === "undefined") {
-    const msg =
-      "Unable to run plan as instrument session not set. Please check visit PV.";
-    throw new Error(msg);
-  } else {
-    instrumentSession = visit.split("/").filter(Boolean).at(-1);
-    if (!instrumentSession) {
-      throw new Error(
-        "Unable to run plan as something appears to be wrong with visit path"
-      );
-    }
-  }
-  return instrumentSession;
-}
-
 export function RunPlanButton(props: RunPlanButtonProps) {
   const [openSnackbar, setOpenSnackbar] = React.useState<boolean>(false);
   const [msg, setMsg] = React.useState<string>("Running plan...");
diff --git a/src/blueapi/visit.ts b/src/blueapi/visit.ts
new file mode 100644
index 0000000..a099add
--- /dev/null
+++ b/src/blueapi/visit.ts
@@ -0,0 +1,39 @@
+import { RawValue } from "../pv/types";
+import { forceString, ReadPvRawValue } from "../pv/util";
+
+/**
+ * Read the full visit path from the visit PV set by the beamline staff.
+ * @returns {string} the full visit pV /dls/i24/data/{year}/{visit}
+ */
+export function readVisitFromPv(): string {
+  const fullVisitPath: RawValue = ReadPvRawValue({
+    label: "visit",
+    pv: "ca://BL24I-MO-IOC-13:GP100",
+  });
+  const visitString: string = forceString(fullVisitPath);
+  return visitString;
+}
+
+/**
+ * Parse the full visit path and return only the instrument session.
+ * An error will be raised if the instrument session value is undefined or
+ * if the PV is not connected.
+ * @param {string} visit The full visit path
+ * @returns {string} Only the instrument session part of the visit path
+ */
+export function parseInstrumentSession(visit: string): string {
+  let instrumentSession: string | undefined;
+  if (visit === "not connected" || visit === "undefined") {
+    const msg =
+      "Unable to run plan as instrument session not set. Please check visit PV.";
+    throw new Error(msg);
+  } else {
+    instrumentSession = visit.split("/").filter(Boolean).at(-1);
+    if (!instrumentSession) {
+      throw new Error(
+        "Unable to run plan as something appears to be wrong with visit path"
+      );
+    }
+  }
+  return instrumentSession;
+}
diff --git a/src/components/Extruder/CollectionSetupEx.tsx b/src/components/Extruder/CollectionSetupEx.tsx
new file mode 100644
index 0000000..b8c3096
--- /dev/null
+++ b/src/components/Extruder/CollectionSetupEx.tsx
@@ -0,0 +1,123 @@
+import { Box, Grid2, Stack } from "@mui/material";
+import React from "react";
+import { ParameterInput } from "../ParameterInputs";
+import {
+  LaserCheckButtons,
+  PumpProbeSelection,
+  PumpProbeSetup,
+} from "./PumpProbeSelection";
+import { AbortButton, RunPlanButton } from "../../blueapi/BlueapiComponents";
+
+/**Main collection input window for the extruderpanel. */
+export function CollectionSetupEx() {
+  const [subDir, setSubDir] = React.useState<string>("path/to/dir");
+  const [fileName, setFileName] = React.useState<string>("test");
+  const [expTime, setExpTime] = React.useState<number>(0.01);
+  const [numImages, setNumImages] = React.useState<number>(1);
+  const [trans, setTrans] = React.useState<number>(0.3);
+  const [detDist, setDetDist] = React.useState<number>(1350);
+  const [pumpProbe, setPumpProbe] = React.useState<boolean>(false);
+  const [laserDwell, setLaserDwell] = React.useState<number>(0);
+  const [laserDelay, setLaserDelay] = React.useState<number>(0);
+
+  return (
+    <Box sx={{ flexGrow: 1, marginRight: 10, marginLeft: 10 }}>
+      <Grid2 container spacing={2}>
+        <Grid2 size={4.5}>
+          <Stack direction={"column"} spacing={1} alignItems={"center"}>
+            <ParameterInput
+              value={subDir}
+              onSet={setSubDir}
+              label="Sub-directory"
+              tooltip="Location inside visit directory to save data"
+            />
+            <ParameterInput
+              value={fileName}
+              onSet={setFileName}
+              label="File Name"
+              tooltip="Filename prefix."
+            />
+            <ParameterInput
+              value={numImages}
+              onSet={setNumImages}
+              label="Number of images"
+              tooltip="How many images should be collected"
+            />
+            <ParameterInput
+              value={expTime}
+              onSet={setExpTime}
+              label="Exposure Time (s)"
+              tooltip="Exposure time for each window, in seconds"
+            />
+            <ParameterInput
+              value={trans}
+              onSet={setTrans}
+              label="Transmission (fraction)"
+              tooltip="Request transmission for collection, expressed as a fraction"
+            />
+            <ParameterInput
+              value={detDist}
+              onSet={setDetDist}
+              label="Detector Distance (mm)"
+              tooltip="Distance to move the detector y stage to, in millimeters"
+            />
+          </Stack>
+        </Grid2>
+        <Grid2 size={3}>
+          <Stack direction={"column"} spacing={1} alignItems={"center"}>
+            <PumpProbeSelection
+              pumpProbe={pumpProbe}
+              setPumpProbe={setPumpProbe}
+            />
+            <PumpProbeSetup
+              dwell={laserDwell}
+              delay={laserDelay}
+              render={pumpProbe}
+              setDwell={setLaserDwell}
+              setDelay={setLaserDelay}
+            />
+            <LaserCheckButtons />
+          </Stack>
+        </Grid2>
+        <Grid2 size={4.5}>
+          <Stack direction={"column"} spacing={1} alignItems={"center"}>
+            <RunPlanButton
+              btnLabel="Initialise on Start"
+              planName="initialise_extruder"
+              title="Initialise parameters for extruder"
+              btnSize="large"
+            />
+            <RunPlanButton
+              btnLabel="Enter hutch"
+              planName="enter_hutch"
+              title="Move detector stage before entering hutch"
+              btnSize="large"
+            />
+          </Stack>
+        </Grid2>
+        <Grid2 size={12}>
+          <Stack direction={"row"} spacing={8} justifyContent={"center"}>
+            <RunPlanButton
+              btnLabel="Start!"
+              planName="gui_run_extruder_collection"
+              planParams={{
+                sub_dir: subDir,
+                file_name: fileName,
+                exp_time: expTime,
+                det_dist: detDist,
+                transmission: trans,
+                num_images: numImages,
+                pump_probe: pumpProbe,
+                laser_dwell: laserDwell,
+                laser_delay: laserDelay,
+              }}
+              title="Start extruder collection"
+              btnSize="large"
+            />
+            <AbortButton />
+          </Stack>
+        </Grid2>
+      </Grid2>
+    </Box>
+  );
+}
diff --git a/src/components/Extruder/PumpProbeSelection.tsx b/src/components/Extruder/PumpProbeSelection.tsx
new file mode 100644
index 0000000..ef505d3
--- /dev/null
+++ b/src/components/Extruder/PumpProbeSelection.tsx
@@ -0,0 +1,101 @@
+import {
+  FormControl,
+  InputLabel,
+  MenuItem,
+  Select,
+  Tooltip,
+} from "@mui/material";
+import { ParameterInput } from "../ParameterInputs";
+import React from "react";
+import { RunPlanButton } from "../../blueapi/BlueapiComponents";
+
+export function PumpProbeSelection({
+  pumpProbe,
+  setPumpProbe,
+}: {
+  pumpProbe: boolean;
+  setPumpProbe: React.Dispatch<React.SetStateAction<boolean>>;
+}) {
+  const handleChange = (choice: string) => {
+    let newValue: boolean;
+    if (choice.toLowerCase() === "true") {
+      newValue = true;
+    } else {
+      newValue = false;
+    }
+    setPumpProbe(newValue);
+  };
+  return (
+    <Tooltip title="Is this a pump probe experiment?" placement="right">
+      <FormControl size="small" style={{ width: 180 }}>
+        <InputLabel id="pp-ex">Pump Probe</InputLabel>
+        <Select
+          labelId="pp-ex"
+          id="pp"
+          value={String(pumpProbe)}
+          label="Pump Probe"
+          onChange={(e) => handleChange(e.target.value)}
+        >
+          <MenuItem value={"true"}>True</MenuItem>
+          <MenuItem value={"false"}>False</MenuItem>
+        </Select>
+      </FormControl>
+    </Tooltip>
+  );
+}
+
+export function PumpProbeSetup({
+  dwell,
+  delay,
+  render,
+  setDwell,
+  setDelay,
+}: {
+  dwell: number;
+  delay: number;
+  render: boolean;
+  setDwell: React.Dispatch<React.SetStateAction<number>>;
+  setDelay: React.Dispatch<React.SetStateAction<number>>;
+}): JSX.Element | null {
+  if (render === false) {
+    return null;
+  } else {
+    return (
+      <React.Fragment>
+        <ParameterInput
+          value={dwell}
+          onSet={setDwell}
+          label="Laser Dwell (s)"
+          tooltip="Exposure time for the laser pump, in seconds"
+        />
+        <ParameterInput
+          value={delay}
+          onSet={setDelay}
+          label="Laser Delay (s)"
+          tooltip="Delay time between the laser pump and the collection, in seconds"
+        />
+      </React.Fragment>
+    );
+  }
+}
+
+export function LaserCheckButtons() {
+  return (
+    <React.Fragment>
+      <RunPlanButton
+        btnLabel="Laser ON"
+        planName="laser_check"
+        planParams={{ mode: "laseron" }}
+        title="Open shutter and check laser beam"
+        btnSize="small"
+      />
+      <RunPlanButton
+        btnLabel="Laser OFF"
+        planName="laser_check"
+        planParams={{ mode: "laseroff" }}
+        title="Switch off laser beam"
+        btnSize="small"
+      />
+    </React.Fragment>
+  );
+}
diff --git a/src/components/FixedTarget/CollectionSetupFt.tsx b/src/components/FixedTarget/CollectionSetupFt.tsx
new file mode 100644
index 0000000..9f3c191
--- /dev/null
+++ b/src/components/FixedTarget/CollectionSetupFt.tsx
@@ -0,0 +1,213 @@
+import {
+  Box,
+  FormControl,
+  Grid2,
+  InputLabel,
+  MenuItem,
+  Select,
+  Stack,
+  Tooltip,
+} from "@mui/material";
+import React from "react";
+import { PumpProbeOptions } from "./PumpProbeComponents";
+import { MapView } from "./FixedTargetMapComponents";
+import { chipTypes, MapTypes, pumpProbeMode } from "../params";
+import { AbortButton, RunPlanButton } from "../../blueapi/BlueapiComponents";
+import { ParameterInput } from "../ParameterInputs";
+
+type ParametersProps = {
+  subDir: string;
+  chipName: string;
+  expTime: number;
+  detDist: number;
+  transFract: number;
+  nShots: number;
+  chipType: string;
+  mapType: string;
+  chipFormat: number[];
+  checkerPattern: boolean;
+  pumpProbe: string;
+  pumpInputs: number[];
+};
+
+/**
+ * Component to add Start and Abort buttons to collection panel.
+ *
+ * @param {ParametersProps} props
+ */
+function RunButtons(props: ParametersProps) {
+  console.log(props);
+  return (
+    <Grid2 size={12}>
+      <Stack direction={"row"} spacing={8} justifyContent={"center"}>
+        <RunPlanButton
+          btnLabel="Start!"
+          planName="gui_run_chip_collection"
+          planParams={{
+            sub_dir: props.subDir,
+            chip_name: props.chipName,
+            exp_time: props.expTime,
+            det_dist: props.detDist,
+            transmission: props.transFract,
+            n_shots: props.nShots,
+            chip_type: props.chipType,
+            map_type: props.mapType,
+            chip_format: props.chipFormat,
+            checker_pattern: props.checkerPattern,
+            pump_probe: props.pumpProbe,
+            laser_dwell: props.pumpInputs[0],
+            laser_delay: props.pumpInputs[1],
+            pre_pump: props.pumpInputs[2],
+          }}
+          title="Start fixed target collection"
+          btnSize="large"
+        />
+        <AbortButton />
+      </Stack>
+    </Grid2>
+  );
+}
+
+/**Main collection input window for the fixed target panel. */
+export function CollectionSetupFt() {
+  const [subDir, setSubDir] = React.useState<string>("path/to/dir");
+  const [chipName, setChipName] = React.useState<string>("test");
+  const [expTime, setExpTime] = React.useState<number>(0.01);
+  const [shots, setShots] = React.useState<number>(1);
+  const [trans, setTrans] = React.useState<number>(0.3);
+  const [detDist, setDetDist] = React.useState<number>(1350);
+  const [pumpProbe, setPumpProbe] = React.useState<string>(pumpProbeMode[0]);
+  const [laserDwell, setLaserDwell] = React.useState<number>(0.0);
+  const [laserDelay, setLaserDelay] = React.useState<number>(0.0);
+  const [prePump, setPrePumpExp] = React.useState<number>(0.0);
+  const [checkerPattern, setChecked] = React.useState(false);
+  const [chipType, setChipType] = React.useState<string>(chipTypes[0]);
+
+  const [mapType, setMapType] = React.useState<string>(MapTypes[0]);
+  const [chipFormat, setChipFormat] = React.useState<number[]>([]);
+
+  return (
+    <Box sx={{ flexGrow: 1, marginRight: 10, marginLeft: 10 }}>
+      <Grid2 container spacing={2}>
+        <Grid2 size={4.5}>
+          <Stack direction={"column"} spacing={1} alignItems={"center"}>
+            <ParameterInput
+              value={subDir}
+              onSet={setSubDir}
+              label="Sub-directory"
+              tooltip="Location inside visit directory to save data"
+            />
+            <ParameterInput
+              value={chipName}
+              onSet={setChipName}
+              label="Chip Name"
+              tooltip="Chip identifier, this will be used as filename"
+            />
+            <ParameterInput
+              value={shots}
+              onSet={setShots}
+              label="Shots Per Aperture"
+              tooltip="How many consecutive times each window should be collected"
+            />
+            <ParameterInput
+              value={expTime}
+              onSet={setExpTime}
+              label="Exposure Time (s)"
+              tooltip="Exposure time for each window, in seconds"
+            />
+            <ParameterInput
+              value={trans}
+              onSet={setTrans}
+              label="Transmission (fraction)"
+              tooltip="Request transmission for collection, expressed as a fraction"
+            />
+            <ParameterInput
+              value={detDist}
+              onSet={setDetDist}
+              label="Detector Distance (mm)"
+              tooltip="Distance to move the detector y stage to, in millimeters"
+            />
+          </Stack>
+        </Grid2>
+        <Grid2 size={3}>
+          <Stack spacing={1} direction={"column"} alignItems={"center"}>
+            <Tooltip
+              title="Is this a pump probe experiment? Choose the setting."
+              placement="right"
+            >
+              <FormControl size="small" style={{ width: 180 }}>
+                <InputLabel id="pp-label">Pump Probe</InputLabel>
+                <Select
+                  labelId="pp-label"
+                  id="pp"
+                  value={pumpProbe}
+                  label="Pump Probe"
+                  onChange={(e) => setPumpProbe(String(e.target.value))}
+                >
+                  {pumpProbeMode.map((ppChoice) => (
+                    <MenuItem key={ppChoice} value={ppChoice}>
+                      {ppChoice}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+            </Tooltip>
+            <PumpProbeOptions
+              pumpProbe={pumpProbe}
+              laserDwell={laserDwell}
+              expTime={expTime}
+              checkerPattern={checkerPattern}
+              setLaserDwell={setLaserDwell}
+              setLaserDelay={setLaserDelay}
+              setPrePumpExp={setPrePumpExp}
+              setChecked={setChecked}
+            />
+          </Stack>
+        </Grid2>
+        <Grid2 size={4.5}>
+          <Stack direction={"column"} alignItems={"center"} spacing={1}>
+            <Tooltip title="Select the type of chip in use" placement="right">
+              <FormControl size="small" style={{ width: 150 }}>
+                <InputLabel id="chip-label">Chip Type</InputLabel>
+                <Select
+                  labelId="chip-label"
+                  id="chip"
+                  value={chipType}
+                  label="Chip Type"
+                  onChange={(e) => setChipType(String(e.target.value))}
+                >
+                  {chipTypes.map((chipType) => (
+                    <MenuItem key={chipType} value={chipType}>
+                      {chipType}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+            </Tooltip>
+            <MapView
+              chipType={chipType}
+              mapType={mapType}
+              chipFormat={chipFormat}
+              setMapType={setMapType}
+              setChipFormat={setChipFormat}
+            />
+          </Stack>
+        </Grid2>
+        <RunButtons
+          subDir={subDir}
+          chipName={chipName}
+          expTime={expTime}
+          detDist={detDist}
+          transFract={trans}
+          nShots={shots}
+          chipType={chipType}
+          mapType={mapType}
+          chipFormat={chipFormat}
+          checkerPattern={checkerPattern.valueOf()}
+          pumpProbe={pumpProbe}
+          pumpInputs={[laserDwell, laserDelay, prePump]}
+        />
+      </Grid2>
+    </Box>
+  );
+}
diff --git a/src/components/CollectionComponents.tsx b/src/components/FixedTarget/FixedTargetMapComponents.tsx
similarity index 64%
rename from src/components/CollectionComponents.tsx
rename to src/components/FixedTarget/FixedTargetMapComponents.tsx
index eef7328..764100a 100644
--- a/src/components/CollectionComponents.tsx
+++ b/src/components/FixedTarget/FixedTargetMapComponents.tsx
@@ -2,16 +2,11 @@ import {
   Box,
   Button,
   ButtonGroup,
-  Checkbox,
   Dialog,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
   FormControl,
   InputLabel,
   MenuItem,
   Select,
-  FormControlLabel,
   Stack,
   TextField,
   ToggleButton,
@@ -19,179 +14,7 @@ import {
   Tooltip,
 } from "@mui/material";
 import React from "react";
-import { calculateEAVA, EavaRequest, MapTypes } from "./params";
-
-/**
- * Opens a dilog showing the calculated laser delay to set for each EAVA setting, given the laser
- * exposure time and collection exposure time.
- *
- * @param {number} laserDwell - laser exposure time
- * @param {number} expTime - collection exposure time
- */
-export function PumpProbeDialog(props: EavaRequest) {
-  const [open, setOpen] = React.useState(false);
-
-  const handleClickOpen = () => {
-    setOpen(true);
-  };
-
-  const handleClose = () => {
-    setOpen(false);
-  };
-
-  return (
-    <React.Fragment>
-      <Tooltip
-        title="Calculate the optimal delay to set for Repeat# Excite And Visit Again settings"
-        placement="bottom"
-      >
-        <Button color="custom" variant="outlined" onClick={handleClickOpen}>
-          EAVA calculator
-        </Button>
-      </Tooltip>
-      <Dialog open={open} onClose={handleClose}>
-        <DialogTitle>EAVA: Excite And Visit Again</DialogTitle>
-        <DialogContent>
-          <DialogContentText>
-            Calculate the laser delay for each Excite And Visit Again setting
-            from laser dwell time and exposure time.
-          </DialogContentText>
-          <Stack direction={"column"} spacing={1} alignItems={"center"}>
-            <p>
-              <b>Repeat1: </b>
-              {calculateEAVA(props.laserDwell, props.expTime, 2)}s
-            </p>
-            <p>
-              <b>Repeat2: </b>
-              {calculateEAVA(props.laserDwell, props.expTime, 4)}s
-            </p>
-            <p>
-              <b>Repeat3: </b>
-              {calculateEAVA(props.laserDwell, props.expTime, 6)}s
-            </p>
-            <p>
-              <b>Repeat5: </b>
-              {calculateEAVA(props.laserDwell, props.expTime, 10)}s
-            </p>
-            <p>
-              <b>Repeat10: </b>
-              {calculateEAVA(props.laserDwell, props.expTime, 20)}s
-            </p>
-          </Stack>
-          <DialogContentText>
-            <b>Notes</b>
-            <ul>
-              <li>
-                The repeat is the number of pairs of lines illuminated before
-                probe.
-              </li>
-              <li>
-                Because the lines in a block are 20, repeat3 will miss some
-                lines
-              </li>
-              <li>
-                ONLY use with Mapping lite, do not run a full Oxford Chip in
-                this mode.
-              </li>
-            </ul>
-          </DialogContentText>
-        </DialogContent>
-      </Dialog>
-    </React.Fragment>
-  );
-}
-
-/**
- * Dynamic component which will show the pump probe options if one of the settings is selected in the
- * dropdown.
- *
- * @param {string} pumpProbe - selected setting
- * @param {number} laserDwell - laser exposure time
- * @param {number} expTime - collection exposure time
- * @param {boolean} checkerPattern - pump in a checkerboard pattern
- * @returns null if the selected pump probe setting is `NoPP`, a JSX.Element with input text fields otherwise
- */
-export function PumpProbeOptions({
-  pumpProbe,
-  laserDwell,
-  expTime,
-  checkerPattern,
-  setLaserDwell,
-  setLaserDelay,
-  setPrePumpExp,
-  setChecked,
-}: {
-  pumpProbe: string;
-  laserDwell: number;
-  expTime: number;
-  checkerPattern: boolean;
-  setLaserDwell: React.Dispatch<React.SetStateAction<number>>;
-  setLaserDelay: React.Dispatch<React.SetStateAction<number>>;
-  setPrePumpExp: React.Dispatch<React.SetStateAction<number>>;
-  setChecked: React.Dispatch<React.SetStateAction<boolean>>;
-}): JSX.Element | null {
-  if (pumpProbe === "NoPP") {
-    return null;
-  }
-
-  return (
-    <Stack spacing={1} direction={"column"}>
-      <Tooltip
-        title="Exposure time for the laser pump, in seconds"
-        placement="right"
-      >
-        <TextField
-          size="small"
-          label="Laser Dwell (s)"
-          defaultValue={laserDwell}
-          onChange={(e) => setLaserDwell(Number(e.target.value))}
-          style={{ width: 150 }}
-        />
-      </Tooltip>
-      <Tooltip
-        title="Delay time between the laser pump and the collection, in seconds"
-        placement="right"
-      >
-        <TextField
-          size="small"
-          label="Laser Delay (s)"
-          defaultValue={0.0}
-          onChange={(e) => setLaserDelay(Number(e.target.value))}
-          style={{ width: 150 }}
-        />
-      </Tooltip>
-      <Tooltip
-        title="How long to collect before laser pump, if setting is Short2, in seconds"
-        placement="right"
-      >
-        <TextField
-          size="small"
-          label="Pre-Pump Exposure Time (s)"
-          defaultValue={0.0}
-          onChange={(e) => setPrePumpExp(Number(e.target.value))}
-          style={{ width: 150 }}
-        />
-      </Tooltip>
-      <Tooltip
-        title="If selected, do pump every other well in a checkerboard pattern"
-        placement="right"
-      >
-        <FormControl>
-          <FormControlLabel
-            label="Checker Pattern"
-            control={
-              <Checkbox
-                checked={checkerPattern}
-                onChange={(e) => setChecked(Boolean(e.target.checked))} // NOPE!
-              />
-            }
-          />
-        </FormControl>
-      </Tooltip>
-      <PumpProbeDialog laserDwell={laserDwell} expTime={expTime} />
-    </Stack>
-  );
-}
+import { MapTypes } from "../params";
 
 /**
  * Create list of numbered ToggleButtons to add to a ToggleButtonGroup
diff --git a/src/components/FixedTarget/PumpProbeComponents.tsx b/src/components/FixedTarget/PumpProbeComponents.tsx
new file mode 100644
index 0000000..b943320
--- /dev/null
+++ b/src/components/FixedTarget/PumpProbeComponents.tsx
@@ -0,0 +1,186 @@
+import {
+  Button,
+  Checkbox,
+  Dialog,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  FormControl,
+  FormControlLabel,
+  Stack,
+  TextField,
+  Tooltip,
+} from "@mui/material";
+import React from "react";
+import { calculateEAVA, EavaRequest } from "../params";
+
+/**
+ * Opens a dilog showing the calculated laser delay to set for each EAVA setting, given the laser
+ * exposure time and collection exposure time.
+ *
+ * @param {EavaRequest} props - parameters for EAVA calculation: laser exposure time and exposure time (in s)
+ */
+export function PumpProbeDialog(props: EavaRequest) {
+  const [open, setOpen] = React.useState(false);
+
+  const handleClickOpen = () => {
+    setOpen(true);
+  };
+
+  const handleClose = () => {
+    setOpen(false);
+  };
+
+  return (
+    <React.Fragment>
+      <Tooltip
+        title="Calculate the optimal delay to set for Repeat# Excite And Visit Again settings"
+        placement="bottom"
+      >
+        <Button color="custom" variant="outlined" onClick={handleClickOpen}>
+          EAVA calculator
+        </Button>
+      </Tooltip>
+      <Dialog open={open} onClose={handleClose}>
+        <DialogTitle>EAVA: Excite And Visit Again</DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+            Calculate the laser delay for each Excite And Visit Again setting
+            from laser dwell time and exposure time.
+          </DialogContentText>
+          <Stack direction={"column"} spacing={1} alignItems={"center"}>
+            <p>
+              <b>Repeat1: </b>
+              {calculateEAVA(props.laserDwell, props.expTime, 2)}s
+            </p>
+            <p>
+              <b>Repeat2: </b>
+              {calculateEAVA(props.laserDwell, props.expTime, 4)}s
+            </p>
+            <p>
+              <b>Repeat3: </b>
+              {calculateEAVA(props.laserDwell, props.expTime, 6)}s
+            </p>
+            <p>
+              <b>Repeat5: </b>
+              {calculateEAVA(props.laserDwell, props.expTime, 10)}s
+            </p>
+            <p>
+              <b>Repeat10: </b>
+              {calculateEAVA(props.laserDwell, props.expTime, 20)}s
+            </p>
+          </Stack>
+          <DialogContentText>
+            <b>Notes</b>
+            <ul>
+              <li>
+                The repeat is the number of pairs of lines illuminated before
+                probe.
+              </li>
+              <li>
+                Because the lines in a block are 20, repeat3 will miss some
+                lines
+              </li>
+              <li>
+                ONLY use with Mapping lite, do not run a full Oxford Chip in
+                this mode.
+              </li>
+            </ul>
+          </DialogContentText>
+        </DialogContent>
+      </Dialog>
+    </React.Fragment>
+  );
+}
+
+/**
+ * Dynamic component which will show the pump probe options if one of the settings is selected in the
+ * dropdown.
+ *
+ * @param {string} pumpProbe - selected setting
+ * @param {number} laserDwell - laser exposure time
+ * @param {number} expTime - collection exposure time
+ * @param {boolean} checkerPattern - pump in a checkerboard pattern
+ * @returns null if the selected pump probe setting is `NoPP`, a JSX.Element with input text fields otherwise
+ */
+export function PumpProbeOptions({
+  pumpProbe,
+  laserDwell,
+  expTime,
+  checkerPattern,
+  setLaserDwell,
+  setLaserDelay,
+  setPrePumpExp,
+  setChecked,
+}: {
+  pumpProbe: string;
+  laserDwell: number;
+  expTime: number;
+  checkerPattern: boolean;
+  setLaserDwell: React.Dispatch<React.SetStateAction<number>>;
+  setLaserDelay: React.Dispatch<React.SetStateAction<number>>;
+  setPrePumpExp: React.Dispatch<React.SetStateAction<number>>;
+  setChecked: React.Dispatch<React.SetStateAction<boolean>>;
+}): JSX.Element | null {
+  if (pumpProbe === "NoPP") {
+    return null;
+  }
+
+  return (
+    <Stack spacing={1} direction={"column"}>
+      <Tooltip
+        title="Exposure time for the laser pump, in seconds"
+        placement="right"
+      >
+        <TextField
+          size="small"
+          label="Laser Dwell (s)"
+          defaultValue={laserDwell}
+          onChange={(e) => setLaserDwell(Number(e.target.value))}
+          style={{ width: 180 }}
+        />
+      </Tooltip>
+      <Tooltip
+        title="Delay time between the laser pump and the collection, in seconds"
+        placement="right"
+      >
+        <TextField
+          size="small"
+          label="Laser Delay (s)"
+          defaultValue={0.0}
+          onChange={(e) => setLaserDelay(Number(e.target.value))}
+          style={{ width: 180 }}
+        />
+      </Tooltip>
+      <Tooltip
+        title="How long to collect before laser pump, if setting is Short2, in seconds"
+        placement="right"
+      >
+        <TextField
+          size="small"
+          label="Pre-Pump Exposure Time (s)"
+          defaultValue={0.0}
+          onChange={(e) => setPrePumpExp(Number(e.target.value))}
+          style={{ width: 180 }}
+        />
+      </Tooltip>
+      <Tooltip
+        title="If selected, do pump every other well in a checkerboard pattern"
+        placement="right"
+      >
+        <FormControl>
+          <FormControlLabel
+            label="Checker Pattern"
+            control={
+              <Checkbox
+                checked={checkerPattern}
+                onChange={(e) => setChecked(Boolean(e.target.checked))} // NOPE!
+              />
+            }
+          />
+        </FormControl>
+      </Tooltip>
+      <PumpProbeDialog laserDwell={laserDwell} expTime={expTime} />
+    </Stack>
+  );
+}
diff --git a/src/components/ParameterInputs.tsx b/src/components/ParameterInputs.tsx
new file mode 100644
index 0000000..e7660f6
--- /dev/null
+++ b/src/components/ParameterInputs.tsx
@@ -0,0 +1,30 @@
+import { TextField, Tooltip } from "@mui/material";
+import React from "react";
+
+interface InputProps<T> {
+  value: T;
+  onSet: React.Dispatch<React.SetStateAction<T>>;
+  label: string;
+  tooltip?: string;
+}
+
+export function ParameterInput<T>(props: InputProps<T>) {
+  const handleChange = (newValue: string) => {
+    if (typeof props.value === "number") {
+      props.onSet(Number(newValue));
+    } else {
+      props.onSet(newValue);
+    }
+  };
+  return (
+    <Tooltip title={props.tooltip ? props.tooltip : ""} placement="left">
+      <TextField
+        size="small"
+        label={props.label}
+        defaultValue={props.value}
+        onChange={(e) => handleChange(e.target.value)}
+        style={{ width: 180 }}
+      />
+    </Tooltip>
+  );
+}
diff --git a/src/components/ReadOnlyInputs.tsx b/src/components/ReadOnlyInputs.tsx
new file mode 100644
index 0000000..9a4e1f2
--- /dev/null
+++ b/src/components/ReadOnlyInputs.tsx
@@ -0,0 +1,19 @@
+import { Grid2 } from "@mui/material";
+import { RoPvBox } from "../pv/PvComponent";
+
+type RoPvAddress = {
+  visit: string;
+  detector: string;
+};
+
+/**
+ * A couple of read-only boxes showing what the visit and detector in use are.
+ */
+export function ReadOnlyInputs(props: RoPvAddress) {
+  return (
+    <Grid2 size={12}>
+      <RoPvBox label="Visit" pv={props.visit} />
+      <RoPvBox label="Detector in use" pv={props.detector} />
+    </Grid2>
+  );
+}
diff --git a/src/components/SelectionControl.tsx b/src/components/SelectionControl.tsx
index 094d4b0..ac010a7 100644
--- a/src/components/SelectionControl.tsx
+++ b/src/components/SelectionControl.tsx
@@ -29,6 +29,7 @@ export function SelectionWithPlanRunner(props: SelectionProps) {
     submitAndRunPlanImmediately({
       planName: props.plan_name,
       planParams: { position: newValue },
+      instrumentSession: "", // FIXME, temporary
     });
   };
 
diff --git a/src/components/SerialNavBar.tsx b/src/components/SerialNavBar.tsx
index 9cadc72..160cea1 100644
--- a/src/components/SerialNavBar.tsx
+++ b/src/components/SerialNavBar.tsx
@@ -24,6 +24,9 @@ export function SerialNavBar() {
         <NavLink linkComponent={Link} to="/fixed-target">
           Fixed Target
         </NavLink>
+        <NavLink linkComponent={Link} to="/extruder">
+          Extruder
+        </NavLink>
       </NavLinks>
     </Navbar>
   );
diff --git a/src/components/params.ts b/src/components/params.ts
index 3315fc3..b95cbc9 100644
--- a/src/components/params.ts
+++ b/src/components/params.ts
@@ -15,8 +15,8 @@ export const pumpProbeMode = [
 ];
 
 export type EavaRequest = {
-  laserDwell: number;
-  expTime: number;
+  laserDwell: number; // Laser exposure time, in s
+  expTime: number; // Collection exposure time, in s
 };
 
 /**
diff --git a/src/routes/Extruder.tsx b/src/routes/Extruder.tsx
new file mode 100644
index 0000000..0ca6ce6
--- /dev/null
+++ b/src/routes/Extruder.tsx
@@ -0,0 +1,26 @@
+import { Box, Typography, useTheme } from "@mui/material";
+import { ReadOnlyInputs } from "../components/ReadOnlyInputs";
+import { ParamsPanel } from "../screens/CollectionPanel";
+
+export function Extruder() {
+  const theme = useTheme();
+  return (
+    <Box marginTop={2}>
+      <Typography
+        variant="h1"
+        sx={{
+          color: theme.palette.info.main,
+          fontSize: 24,
+          fontWeight: "fontWeightBold",
+        }}
+      >
+        Extruder Data Collection Setup
+      </Typography>
+      <ReadOnlyInputs
+        visit="ca://BL24I-MO-IOC-13:GP1"
+        detector="ca://BL24I-MO-IOC-13:GP15"
+      />
+      <ParamsPanel expt="extruder" />
+    </Box>
+  );
+}
diff --git a/src/routes/FixedTarget.tsx b/src/routes/FixedTarget.tsx
index f6256b4..1d8fe4f 100644
--- a/src/routes/FixedTarget.tsx
+++ b/src/routes/FixedTarget.tsx
@@ -1,5 +1,6 @@
 import { Box, Typography, useTheme } from "@mui/material";
 import { ParamsPanel } from "../screens/CollectionPanel";
+import { ReadOnlyInputs } from "../components/ReadOnlyInputs";
 
 export function FixedTarget() {
   const theme = useTheme();
@@ -15,7 +16,11 @@ export function FixedTarget() {
       >
         Fixed Target Data Collection Setup
       </Typography>
-      <ParamsPanel />
+      <ReadOnlyInputs
+        visit="ca://BL24I-MO-IOC-13:GP100"
+        detector="ca://BL24I-MO-IOC-13:GP101"
+      />
+      <ParamsPanel expt="fixed-target" />
     </Box>
   );
 }
diff --git a/src/screens/CollectionPanel.tsx b/src/screens/CollectionPanel.tsx
index 4f6258d..9629d9d 100644
--- a/src/screens/CollectionPanel.tsx
+++ b/src/screens/CollectionPanel.tsx
@@ -1,279 +1,28 @@
-import {
-  Box,
-  FormControl,
-  Grid2,
-  InputLabel,
-  MenuItem,
-  Select,
-  Stack,
-  TextField,
-  Tooltip,
-} from "@mui/material";
-import { PvComponent } from "../pv/PvComponent";
-import React from "react";
-import { MapView, PumpProbeOptions } from "../components/CollectionComponents";
-import { chipTypes, MapTypes, pumpProbeMode } from "../components/params";
-import { forceString } from "../pv/util";
-import { AbortButton, RunPlanButton } from "../blueapi/BlueapiComponents";
+import { Box, Typography } from "@mui/material";
+import { CollectionSetupFt } from "../components/FixedTarget/CollectionSetupFt";
+import { CollectionSetupEx } from "../components/Extruder/CollectionSetupEx";
 
-/**
- * A couple of read-only boxes showing what the visit and detector in use are.
- */
-function FixedInputs() {
-  return (
-    <Grid2 size={12}>
-      <PvComponent
-        label="Visit"
-        pv="ca://BL24I-MO-IOC-13:GP100"
-        transformValue={forceString}
-      />
-      <PvComponent
-        label="Detector in use"
-        pv="ca://BL24I-MO-IOC-13:GP101"
-        transformValue={forceString}
-      />
-    </Grid2>
-  );
-}
-
-type ParametersProps = {
-  subDir: string;
-  chipName: string;
-  expTime: number;
-  detDist: number;
-  transFract: number;
-  nShots: number;
-  chipType: string;
-  mapType: string;
-  chipFormat: number[];
-  checkerPattern: boolean;
-  pumpProbe: string;
-  pumpInputs: number[];
+type ExptType = {
+  expt: "extruder" | "fixed-target";
 };
 
-/**
- * Component to add Start and Abort buttons to collection panel.
- *
- * @param {ParametersProps} props
- */
-function RunButtons(props: ParametersProps) {
-  console.log(props);
-  return (
-    <Grid2 size={12}>
-      <Stack direction={"row"} spacing={8} justifyContent={"center"}>
-        <RunPlanButton
-          btnLabel="Start!"
-          planName="gui_run_chip_collection"
-          planParams={{
-            sub_dir: props.subDir,
-            chip_name: props.chipName,
-            exp_time: props.expTime,
-            det_dist: props.detDist,
-            transmission: props.transFract,
-            n_shots: props.nShots,
-            chip_type: props.chipType,
-            map_type: props.mapType,
-            chip_format: props.chipFormat,
-            checker_pattern: props.checkerPattern,
-            pump_probe: props.pumpProbe,
-            laser_dwell: props.pumpInputs[0],
-            laser_delay: props.pumpInputs[1],
-            pre_pump: props.pumpInputs[2],
-          }}
-          title="Start fixed target collection"
-          btnSize="large"
-        />
-        <AbortButton />
-      </Stack>
-    </Grid2>
-  );
-}
-
-/**Main collection input window for the panel. */
-function CollectionInput() {
-  const [subDir, setSubDir] = React.useState<string>("path/to/dir");
-  const [chipName, setChipName] = React.useState<string>("test");
-  const [expTime, setExpTime] = React.useState<number>(0.01);
-  const [shots, setShots] = React.useState<number>(1);
-  const [trans, setTrans] = React.useState<number>(0.3);
-  const [detDist, setDetDist] = React.useState<number>(1350);
-  const [pumpProbe, setPumpProbe] = React.useState<string>(pumpProbeMode[0]);
-  const [laserDwell, setLaserDwell] = React.useState<number>(0.0);
-  const [laserDelay, setLaserDelay] = React.useState<number>(0.0);
-  const [prePump, setPrePumpExp] = React.useState<number>(0.0);
-  const [checkerPattern, setChecked] = React.useState(false);
-  const [chipType, setChipType] = React.useState<string>(chipTypes[0]);
-
-  const [mapType, setMapType] = React.useState<string>(MapTypes[0]);
-  const [chipFormat, setChipFormat] = React.useState<number[]>([]);
-
+function FallbackScreen() {
   return (
-    <Box sx={{ flexGrow: 1 }}>
-      <Grid2 container spacing={2}>
-        <FixedInputs />
-        <Grid2 size={4.5}>
-          <Stack direction={"column"} spacing={1} alignItems={"center"}>
-            <Tooltip
-              title="Location inside visit directory to save data"
-              placement="left"
-            >
-              <TextField
-                size="small"
-                label="Sub-directory"
-                defaultValue={subDir}
-                onChange={(e) => setSubDir(String(e.target.value))}
-                style={{ width: 180 }}
-              />
-            </Tooltip>
-            <Tooltip
-              title="Chip identifier, this will be used as filename"
-              placement="left"
-            >
-              <TextField
-                size="small"
-                label="Chip Name"
-                defaultValue={chipName}
-                onChange={(e) => setChipName(String(e.target.value))}
-                style={{ width: 180 }}
-              />
-            </Tooltip>
-            <Tooltip
-              title="How many consecutive times each window should be collected."
-              placement="left"
-            >
-              <TextField
-                size="small"
-                label="Shots Per Aperture"
-                defaultValue={shots}
-                onChange={(e) => setShots(Number(e.target.value))}
-                style={{ width: 180 }}
-              />
-            </Tooltip>
-            <Tooltip
-              title="Exposure time for each window, in seconds"
-              placement="left"
-            >
-              <TextField
-                size="small"
-                label="Exposure Time (s)"
-                defaultValue={expTime}
-                onChange={(e) => setExpTime(Number(e.target.value))}
-                style={{ width: 180 }}
-              />
-            </Tooltip>
-            <Tooltip
-              title="Request transmission for collection, expressed as a fraction"
-              placement="left"
-            >
-              <TextField
-                size="small"
-                label="Transmission (fraction)"
-                defaultValue={trans}
-                onChange={(e) => setTrans(Number(e.target.value))}
-                style={{ width: 180 }}
-              />
-            </Tooltip>
-            <Tooltip
-              title="Distance to move the detector y stage to, in millimeters"
-              placement="left"
-            >
-              <TextField
-                size="small"
-                label="Detector Distance (mm)"
-                defaultValue={detDist}
-                onChange={(e) => setDetDist(Number(e.target.value))}
-                style={{ width: 180 }}
-              />
-            </Tooltip>
-          </Stack>
-        </Grid2>
-        <Grid2 size={3}>
-          <Stack spacing={1} direction={"column"}>
-            <Tooltip
-              title="Is this a pump probe experiment? Choose the setting."
-              placement="right"
-            >
-              <FormControl size="small" style={{ width: 150 }}>
-                <InputLabel id="pp-label">Pump Probe</InputLabel>
-                <Select
-                  labelId="pp-label"
-                  id="pp"
-                  value={pumpProbe}
-                  label="Pump Probe"
-                  onChange={(e) => setPumpProbe(String(e.target.value))}
-                >
-                  {pumpProbeMode.map((pumpProbe) => (
-                    <MenuItem key={pumpProbe} value={pumpProbe}>
-                      {pumpProbe}
-                    </MenuItem>
-                  ))}
-                </Select>
-              </FormControl>
-            </Tooltip>
-            <PumpProbeOptions
-              pumpProbe={pumpProbe}
-              laserDwell={laserDwell}
-              expTime={expTime}
-              checkerPattern={checkerPattern}
-              setLaserDwell={setLaserDwell}
-              setLaserDelay={setLaserDelay}
-              setPrePumpExp={setPrePumpExp}
-              setChecked={setChecked}
-            />
-          </Stack>
-        </Grid2>
-        <Grid2 size={4.5}>
-          <Stack direction={"column"} alignItems={"center"} spacing={1}>
-            <Tooltip title="Select the type of chip in use" placement="right">
-              <FormControl size="small" style={{ width: 150 }}>
-                <InputLabel id="chip-label">Chip Type</InputLabel>
-                <Select
-                  labelId="chip-label"
-                  id="chip"
-                  value={chipType}
-                  label="Chip Type"
-                  onChange={(e) => setChipType(String(e.target.value))}
-                >
-                  {chipTypes.map((chipType) => (
-                    <MenuItem key={chipType} value={chipType}>
-                      {chipType}
-                    </MenuItem>
-                  ))}
-                </Select>
-              </FormControl>
-            </Tooltip>
-            <MapView
-              chipType={chipType}
-              mapType={mapType}
-              chipFormat={chipFormat}
-              setMapType={setMapType}
-              setChipFormat={setChipFormat}
-            />
-          </Stack>
-        </Grid2>
-        <RunButtons
-          subDir={subDir}
-          chipName={chipName}
-          expTime={expTime}
-          detDist={detDist}
-          transFract={trans}
-          nShots={shots}
-          chipType={chipType}
-          mapType={mapType}
-          chipFormat={chipFormat}
-          checkerPattern={checkerPattern.valueOf()}
-          pumpProbe={pumpProbe}
-          pumpInputs={[laserDwell, laserDelay, prePump]}
-        />
-      </Grid2>
+    <Box>
+      <Typography component="h1" variant="h4">
+        Page currently unavailable
+      </Typography>
     </Box>
   );
 }
 
-export function ParamsPanel() {
-  return (
-    <Stack direction="column">
-      <CollectionInput />
-    </Stack>
-  );
+export function ParamsPanel(expt: ExptType) {
+  switch (expt.expt) {
+    case "fixed-target":
+      return <CollectionSetupFt />;
+    case "extruder":
+      return <CollectionSetupEx />;
+    default:
+      return <FallbackScreen />;
+  }
 }
diff --git a/src/screens/OavMover.tsx b/src/screens/OavMover.tsx
index b67a538..b7bb9cd 100644
--- a/src/screens/OavMover.tsx
+++ b/src/screens/OavMover.tsx
@@ -30,11 +30,8 @@ import { PvDescription } from "../pv/types";
 import { SelectionWithPlanRunner } from "../components/SelectionControl";
 import { BacklightPositions, ZoomLevels } from "../pv/enumPvValues";
 import oxfordChipDiagram from "../assets/Oxford Chip Diagram.excalidraw.svg";
-import {
-  parseInstrumentSession,
-  readVisitFromPv,
-  RunPlanButton,
-} from "../blueapi/BlueapiComponents";
+import { RunPlanButton } from "../blueapi/BlueapiComponents";
+import { parseInstrumentSession, readVisitFromPv } from "../blueapi/visit";
 
 const buttonStyle = {
   color: "white",
@@ -264,13 +261,13 @@ export function CoordinateSystem() {
     setOpen(false);
   };
 
-  const buttonStyle = {
-    color: "white",
-    padding: "12px",
-    backgroundColor: "#1c2025",
-    width: "100%",
-    height: "85%",
-  };
+  // const buttonStyle = {
+  //   color: "white",
+  //   padding: "12px",
+  //   backgroundColor: "#1c2025",
+  //   width: "100%",
+  //   height: "85%",
+  // };
 
   return (
     <>