diff --git a/changes.d/2100.feat.md b/changes.d/2100.feat.md
new file mode 100644
index 000000000..9a40cc43d
--- /dev/null
+++ b/changes.d/2100.feat.md
@@ -0,0 +1 @@
+Adding CPU time and Max RSS to Analysis Tools
diff --git a/public/img/redline.jpg b/public/img/redline.jpg
new file mode 100644
index 000000000..97bb61f86
Binary files /dev/null and b/public/img/redline.jpg differ
diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index 21d99775c..b698074bf 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -56,7 +56,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { upperFirst } from 'lodash'
-import { formatDuration } from '@/utils/tasks'
+import {
+  formatDuration,
+  formatHeader,
+  formatChartLabels,
+} from '@/utils/tasks'
 import {
   initialOptions,
   updateInitialOptionsEvent,
@@ -128,50 +132,76 @@ export default {
   computed: {
     shownHeaders () {
       const times = upperFirst(this.timingOption)
-      const timingHeaders = [
-        {
-          title: `Mean T-${times}`,
-          key: `mean${times}Time`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Std Dev T-${times}`,
-          key: `stdDev${times}Time`,
-          formatter: formatDuration,
-          allowZeros: true
-        },
-        {
-          title: `Min T-${times}`,
-          key: `min${times}Time`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Q1 T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.0`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Median T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.1`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Q3 T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.2`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Max T-${times}`,
-          key: `max${times}Time`,
+      const timingHeaders = []
+      // Check if there are any stats to show
+      const stats = this.tasks.some((task) => task.count > 1)
+      if (stats) {
+        timingHeaders.push(
+          {
+            title: `Mean ${formatChartLabels(times)}`,
+            key: `${formatHeader('mean', times)}`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Min ${formatChartLabels(times)}`,
+            key: `${formatHeader('min', times)}`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Q1 ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.0`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Median ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.1`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Q3 ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.2`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Max ${formatChartLabels(times)}`,
+            key: `${formatHeader('max', times)}`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          }
+        )
+      } else {
+        timingHeaders.push(
+          {
+            title: `${formatChartLabels(times)}`,
+            key: `${formatHeader('mean', times)}`,
+            formatter: formatDuration,
+            allowZeros: true,
+            timingOption: this.timingOption
+          }
+        )
+      }
+
+      // Don't show std dev for cpuTime or maxRss
+      if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss' && stats) {
+        timingHeaders.push({
+          title: `Std Dev ${times}`,
+          key: `${formatHeader('stdDev', times)}`,
           formatter: formatDuration,
-          allowZeros: false
-        }
-      ]
+          allowZeros: true,
+          timingOption: this.timingOption
+        })
+      }
       return this.headers.concat(timingHeaders)
     }
   },
@@ -186,7 +216,7 @@ export default {
         value = value[index]
       }
       if (header.formatter) {
-        return header.formatter(value, header)
+        return header.formatter(value, header.allowZeros, this.timingOption)
       }
       return value
     }
diff --git a/src/components/cylc/analysis/BoxPlot.vue b/src/components/cylc/analysis/BoxPlot.vue
index 978c5ed49..25a69d167 100644
--- a/src/components/cylc/analysis/BoxPlot.vue
+++ b/src/components/cylc/analysis/BoxPlot.vue
@@ -41,13 +41,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </div>
   </Teleport>
   <VueApexCharts
+    data-cy="box-plot-chart"
     type="boxPlot"
     :options="chartOptions"
     :series="series"
     :height="105 + series[0].data.length * 60"
     width="95%"
     class="d-flex justify-center"
-  />
+    />
   <v-pagination
     v-model="page"
     :length="numPages"
@@ -65,7 +66,12 @@ import {
   mdiSortVariant,
 } from '@mdi/js'
 import { upperFirst } from 'lodash'
-import { formatDuration } from '@/utils/tasks'
+import {
+  formatDuration,
+  getTimingOption,
+  formatChartLabels,
+  compare,
+} from '@/utils/tasks'
 import { useReducedAnimation } from '@/composables/localStorage'
 import {
   initialOptions,
@@ -121,86 +127,132 @@ export default {
     const page = useInitialOptions('page', { props, emit }, 1)
 
     /**
-     * The sort descending/sscending state.
+     * The sort descending/ascending state.
      * @type {import('vue').Ref<boolean>}
      */
     const sortDesc = useInitialOptions('sortDesc', { props, emit }, false)
 
     const reducedAnimation = useReducedAnimation()
 
-    const chartOptions = computed(() => ({
-      chart: {
-        defaultLocale: 'en',
-        locales: [
-          {
-            name: 'en',
-            options: {
-              toolbar: {
-                exportToSVG: 'Download SVG',
-                exportToPNG: 'Download PNG',
-                menu: 'Download'
+    const chartOptions = computed(() => {
+      const currentTasks = (() => {
+        if (props.timingOption === 'maxRss') {
+          const sortedTasks = [...props.tasks].sort((a, b) => compare(a, b, sortBy.value, sortDesc.value))
+          const startIndex = Math.max(0, props.itemsPerPage * (page.value - 1))
+          const endIndex = Math.min(sortedTasks.length, startIndex + props.itemsPerPage)
+          return sortedTasks.slice(startIndex, endIndex)
+        }
+        return []
+      })()
+
+      return {
+        chart: {
+          defaultLocale: 'en',
+          locales: [
+            {
+              name: 'en',
+              options: {
+                toolbar: {
+                  exportToSVG: 'Download SVG',
+                  exportToPNG: 'Download PNG',
+                  menu: 'Download'
+                }
               }
             }
-          }
-        ],
-        animations: {
-          enabled: reducedAnimation.value ? false : props.animate,
-          easing: 'easeinout',
-          speed: 300,
-          animateGradually: {
-            enabled: true,
-            delay: 150,
-          },
-          dynamicAnimation: {
-            enabled: true,
-            speed: 350,
+          ],
+          animations: {
+            enabled: reducedAnimation.value ? false : props.animate,
+            easing: 'easeinout',
+            speed: 300,
+            animateGradually: {
+              enabled: true,
+              delay: 150,
+            },
+            dynamicAnimation: {
+              enabled: true,
+              speed: 350,
+            },
           },
-        },
-        fontFamily: 'inherit',
-        toolbar: {
-          tools: {
-            download: `<svg class="w-100 h-100"><path d="${mdiDownload}"></path></svg>`,
+          fontFamily: 'inherit',
+          toolbar: {
+            tools: {
+              download: `<svg class="w-100 h-100"><path d="${mdiDownload}"></path></svg>`,
+            },
           },
         },
-      },
-      tooltip: {
-        custom ({ seriesIndex, dataPointIndex, w }) {
-          const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], { allowZeros: true })
-          const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], { allowZeros: true })
-          const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], { allowZeros: true })
-          const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], { allowZeros: true })
-          const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], { allowZeros: true })
-          return `
-            <div class="pa-2">
+        tooltip: {
+          custom ({ seriesIndex, dataPointIndex, w }) {
+            const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], true, props.timingOption)
+            const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], true, props.timingOption)
+            const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], true, props.timingOption)
+            const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], true, props.timingOption)
+            const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], true, props.timingOption)
+            if (props.timingOption === 'maxRss') {
+              const memAlloc = formatDuration(w.globals.series[seriesIndex][dataPointIndex], true, props.timingOption)
+              return `
+              <div class="pa-2">
               <div>Maximum: ${max}</div>
               <div>Q3: ${q3} </div>
               <div>Median: ${med}</div>
               <div>Q1: ${q1}</div>
               <div>Minimum: ${min}</div>
-            </div>
-          `
+              <div>Memory Allocated: ${memAlloc}</div>
+              </div>
+            `
+            } else {
+              return `
+              <div class="pa-2">
+              <div>Maximum: ${max}</div>
+              <div>Q3: ${q3} </div>
+              <div>Median: ${med}</div>
+              <div>Q1: ${q1}</div>
+              <div>Minimum: ${min}</div>
+              </div>
+            `
+            }
+          },
         },
-      },
-      plotOptions: {
-        bar: {
-          horizontal: true,
+        annotations: {
+          position: 'front',
+          points: currentTasks.map(point => ({
+            x: point.memAlloc,
+            y: point.name,
+            marker: {
+              size: 0 // Hides the default marker
+            },
+            image: {
+              path: 'img/redline.jpg',
+              width: 40,
+              height: 60,
+              offsetX: 0,
+              offsetY: -3,
+            }
+          }))
         },
-        boxPlot: {
-          colors: {
-            upper: '#6DD5C2',
-            lower: '#6AA4F1',
+        plotOptions: {
+          bar: {
+            horizontal: true,
+          },
+          boxPlot: {
+            colors: {
+              upper: '#6DD5C2',
+              lower: '#6AA4F1',
+            },
           },
         },
-      },
-      xaxis: {
-        title: {
-          text: `${upperFirst(props.timingOption)} time`,
-        },
-        labels: {
-          formatter: (value) => formatDuration(value, { allowZeros: true })
+        xaxis: {
+          min: currentTasks.length > 0 ? 0 : undefined,
+          max: currentTasks.length > 0 ? Math.ceil(Math.max(0, ...currentTasks.map(t => t.memAlloc)) * 1.05) : undefined,
+          type: 'numeric',
+          title: {
+            text: `${formatChartLabels(props.timingOption)}`,
+          },
+          labels: {
+            formatter: (value) => formatDuration(value, true, props.timingOption)
+          },
         },
-      },
-    }))
+      }
+    })
 
     return {
       sortBy,
@@ -212,24 +264,24 @@ export default {
 
   computed: {
     series () {
-      const sortedTasks = [...this.tasks].sort(this.compare)
+      const sortedTasks = [...this.tasks].sort((a, b) => compare(a, b, this.sortBy, this.sortDesc))
       const startIndex = Math.max(0, this.itemsPerPage * (this.page - 1))
       const endIndex = Math.min(sortedTasks.length, startIndex + this.itemsPerPage)
-
-      const data = []
+      const boxData = []
       for (let i = startIndex; i < endIndex; i++) {
-        data.push({
+        boxData.push({
           x: sortedTasks[i].name,
           y: [
-            sortedTasks[i][`min${upperFirst(this.timingOption)}Time`],
+            sortedTasks[i][`min${upperFirst(getTimingOption(this.timingOption))}`],
             sortedTasks[i][`${this.timingOption}Quartiles`][0],
             sortedTasks[i][`${this.timingOption}Quartiles`][1],
             sortedTasks[i][`${this.timingOption}Quartiles`][2],
-            sortedTasks[i][`max${upperFirst(this.timingOption)}Time`],
-          ],
+            sortedTasks[i][`max${upperFirst(getTimingOption(this.timingOption))}`],
+            sortedTasks[i].memAlloc > 0 ? sortedTasks[i].memAlloc : 1 // ApexCharts seems inconsistent if this extra data is 0
+          ]
         })
       }
-      return [{ data }]
+      return [{ name: 'boxPlot', type: 'boxPlot', data: boxData }]
     },
 
     numPages () {
@@ -241,10 +293,10 @@ export default {
         { title: 'Task name', value: 'name' },
         { title: 'Platform', value: 'platform' },
         { title: 'Count', value: 'count' },
-        { title: `Mean ${this.timingOption} time`, value: `mean${upperFirst(this.timingOption)}Time` },
-        { title: `Median ${this.timingOption} time`, value: `median${upperFirst(this.timingOption)}Time` },
-        { title: `Min ${this.timingOption} time`, value: `min${upperFirst(this.timingOption)}Time` },
-        { title: `Max ${this.timingOption} time`, value: `max${upperFirst(this.timingOption)}Time` },
+        { title: `Mean ${formatChartLabels(this.timingOption)}`, value: `mean${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Median ${formatChartLabels(this.timingOption)}`, value: `median${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Min ${formatChartLabels(this.timingOption)}`, value: `min${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Max ${formatChartLabels(this.timingOption)}`, value: `max${upperFirst(getTimingOption(this.timingOption))}` },
       ]
     },
   },
@@ -256,18 +308,6 @@ export default {
     }
   },
 
-  methods: {
-    /**
-     * @param {string|number} a
-     * @param {string|number} b
-     * @returns {number}
-     */
-    compare (a, b) {
-      const ret = a[this.sortBy] < b[this.sortBy] ? -1 : 1
-      return this.sortDesc ? -ret : ret
-    },
-  },
-
   icons: {
     sortAsc: mdiSortReverseVariant,
     sortDesc: mdiSortVariant,
diff --git a/src/components/cylc/analysis/TimeSeries.vue b/src/components/cylc/analysis/TimeSeries.vue
index 7830d70ef..9bcef10d4 100644
--- a/src/components/cylc/analysis/TimeSeries.vue
+++ b/src/components/cylc/analysis/TimeSeries.vue
@@ -93,11 +93,14 @@ import {
   difference,
   pick,
   union,
-  uniq,
-  upperFirst
+  uniq
 } from 'lodash'
 import gql from 'graphql-tag'
-import { formatDuration } from '@/utils/tasks'
+import {
+  getTimingOption,
+  formatDuration,
+  formatChartLabels
+} from '@/utils/tasks'
 import {
   mdiDownload,
   mdiRefresh,
@@ -119,7 +122,9 @@ const jobFields = [
   'totalTime',
   'queueTime',
   'runTime',
-  'startedTime'
+  'startedTime',
+  'maxRss',
+  'cpuTime'
 ]
 
 /** The one-off query which retrieves historical job timing statistics */
@@ -284,7 +289,7 @@ export default {
             const currentStartedTime = seriesData[job.name].data[job.cyclePoint].startedTime
             // Only add data if this job was run more recently than any existing data
             if (currentStartedTime === undefined || job.startedTime.localeCompare(currentStartedTime) === 1) {
-              time = job[`${this.timingOption}Time`]
+              time = job[getTimingOption(this.timingOption)]
               Object.assign(seriesData[job.name].data[job.cyclePoint], {
                 x: job.cyclePoint,
                 y: time,
@@ -366,7 +371,7 @@ export default {
               if (!value) {
                 return null
               }
-              const y = formatDuration(value, { allowZeros: true })
+              const y = formatDuration(value, true, this.timingOption)
               const platform = this.series[seriesIndex].data[dataPointIndex].platform
               return `${y} (${platform})`
             }
@@ -384,10 +389,10 @@ export default {
           forceNiceScale: true,
           min: this.showOrigin ? 0 : undefined,
           title: {
-            text: upperFirst(this.timingOption) + ' time',
+            text: formatChartLabels(this.timingOption),
           },
           labels: {
-            formatter: (value) => formatDuration(value, { allowZeros: true })
+            formatter: (value) => formatDuration(value, true, this.timingOption)
           },
         },
       }
@@ -443,10 +448,10 @@ export default {
         yaxis: {
           tickAmount: 3,
           title: {
-            text: upperFirst(this.timingOption) + ' time',
+            text: formatChartLabels(this.timingOption),
           },
           labels: {
-            formatter: (value) => formatDuration(value, { allowZeros: true })
+            formatter: (value) => formatDuration(value, true, this.timingOption)
           },
           min: this.showOrigin ? 0 : undefined
         },
diff --git a/src/services/mock/json/analysisQuery.json b/src/services/mock/json/analysisQuery.json
index 583d20a6e..d10276290 100644
--- a/src/services/mock/json/analysisQuery.json
+++ b/src/services/mock/json/analysisQuery.json
@@ -19,7 +19,20 @@
           "stdDevQueueTime": 3,
           "minQueueTime": 9,
           "queueQuartiles": [10, 11, 13],
-          "maxQueueTime": 14
+          "maxQueueTime": 14,
+          "maxMaxRss": 20000000,
+          "meanMaxRss": 10000000,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 5000000,
+          "maxRssQuartiles": [5500000, 10000000, 15000000],
+          "maxCpuTime": 30000,
+          "meanCpuTime": 20000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 10000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 20000, 30000],
+          "totalOfTotals": 420000,
+          "memAlloc": 1073741824
         },
         {
           "name": "eventually_succeeded",
@@ -39,7 +52,20 @@
           "stdDevQueueTime": 2,
           "minQueueTime": 8,
           "queueQuartiles": [9, 10, 11],
-          "maxQueueTime": 11
+          "maxQueueTime": 11,
+          "maxMaxRss": 30000000,
+          "meanMaxRss": 20000000,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 6000000,
+          "maxRssQuartiles": [6600000, 20000000, 25000000],
+          "maxCpuTime": 20000,
+          "meanCpuTime": 10000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 1000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 11000, 13000],
+          "totalOfTotals": 420000,
+          "memAlloc": 1073741824
         },
         {
           "name": "waiting",
@@ -59,7 +85,20 @@
           "stdDevQueueTime": 3,
           "minQueueTime": 10,
           "queueQuartiles": [10, 12, 13],
-          "maxQueueTime": 14
+          "maxQueueTime": 14,
+          "maxMaxRss": 40000000,
+          "meanMaxRss": 30000000,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 7000000,
+          "maxRssQuartiles": [7700000, 30000000, 35000000],
+          "maxCpuTime": 30000,
+          "meanCpuTime": 20000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 9000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 11000, 13000],
+          "totalOfTotals": 420000,
+          "memAlloc": 1073741824
         }
       ]
     }
@@ -74,7 +113,9 @@
           "totalTime": 60,
           "queueTime": 2,
           "runTime": 58,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "succeeded",
@@ -83,7 +124,9 @@
           "totalTime": 61,
           "queueTime": 2,
           "runTime": 59,
-          "startedTime": "2023-01-01T01:00:00Z"
+          "startedTime": "2023-01-01T01:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "succeeded",
@@ -92,7 +135,9 @@
           "totalTime": 62,
           "queueTime": 2,
           "runTime": 60,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -101,7 +146,9 @@
           "totalTime": 41,
           "queueTime": 2,
           "runTime": 39,
-          "startedTime": "2023-01-01T01:00:00Z"
+          "startedTime": "2023-01-01T01:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -110,7 +157,9 @@
           "totalTime": 40,
           "queueTime": 2,
           "runTime": 38,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -119,7 +168,9 @@
           "totalTime": 42,
           "queueTime": 2,
           "runTime": 40,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -128,7 +179,9 @@
           "totalTime": 50,
           "queueTime": 2,
           "runTime": 48,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -137,7 +190,10 @@
           "totalTime": 4,
           "queueTime": 2,
           "runTime": 2,
-          "startedTime": "2023-01-01T02:01:00Z"},
+          "startedTime": "2023-01-01T02:01:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
+        },
         {
           "name": "waiting",
           "platform": "platform_2",
@@ -145,7 +201,9 @@
           "totalTime": 52,
           "queueTime": 2,
           "runTime": 50,
-          "startedTime": "2023-01-01T02:02:00Z"
+          "startedTime": "2023-01-01T02:02:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -154,7 +212,9 @@
           "totalTime": 3,
           "queueTime": 2,
           "runTime": 1,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         }
       ]
     }
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index 12ff8c826..c03793bbe 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -17,7 +17,9 @@
 
 import TaskState from '@/model/TaskState.model'
 import { TASK_OUTPUT_NAMES } from '@/model/TaskOutput.model'
-
+import {
+  upperFirst
+} from 'lodash'
 /**
  * States used when the parent is stopped.
  * @type {TaskState[]}
@@ -97,26 +99,111 @@ export function jobMessageOutputs (jobNode) {
  * 00:00:00, rather than undefined
  * @return {string=} Formatted duration
  */
-export function formatDuration (dur, { allowZeros = false } = {}) {
-  if (dur || (dur === 0 && allowZeros === true)) {
-    const seconds = dur % 60
-    const minutes = ((dur - seconds) / 60) % 60
-    const hours = ((dur - minutes * 60 - seconds) / 3600) % 24
-    const days = (dur - hours * 3600 - minutes * 60 - seconds) / 86400
-
-    let dayss = ''
-    if (days > 0) {
-      dayss = days.toString() + 'd '
+export function formatDuration (value, allowZeros = false, timingOption = true) {
+  if (timingOption === 'maxRss') {
+    return formatRSS(value)
+  }
+  // Times are formatted as HH:MM:SS
+  if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime' || timingOption === true) {
+    if (value || (value === 0 && allowZeros === true)) {
+      // Convert CPU time to seconds
+      if (timingOption === 'cpuTime') {
+        value = value / 1000
+      }
+      const seconds = value % 60
+      const minutes = ((value - seconds) / 60) % 60
+      const hours = ((value - minutes * 60 - seconds) / 3600) % 24
+      const days = (value - hours * 3600 - minutes * 60 - seconds) / 86400
+
+      let dayss = ''
+      if (days > 0) {
+        dayss = days.toString() + 'd '
+      }
+
+      return dayss +
+        hours.toString().padStart(2, '0') +
+        ':' + minutes.toString().padStart(2, '0') +
+        ':' + Math.round(seconds).toString().padStart(2, '0')
     }
+    // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
+    // return "undefined" rather than a number for these cases
+    return undefined
+  }
+}
+
+function formatRSS (value) {
+  // Format the max RSS value in a human-readable format
+  if (value === undefined || value === null) {
+    return undefined
+  } else if (value / 1024 < 1000) {
+    const kilobytes = value / 1024
+    return kilobytes.toPrecision(3) + ' KB'
+  } else if (value / 1048576 < 1000) {
+    const megabytes = value / 1048576
+    return megabytes.toPrecision(3) + ' MB'
+  } else {
+    const gigabytes = value / 1073741824
+    return gigabytes.toPrecision(3) + ' GB'
+  }
+}
+
+export function compare (a, b, sortBy, sortDesc) {
+  /**
+   * @param {string|number} a
+   * @param {string|number} b
+   * @returns {number}
+  */
+  let ret = ''
+  // Median values are stored in quartile arrays, so need to access the 2nd element
+  if (sortBy === 'medianRunTime' || sortBy === 'medianQueueTime' || sortBy === 'medianTotalTime' || sortBy === 'medianMaxRss') {
+    sortBy = sortBy.replace('median', '').replace('Time', '')
+    sortBy = sortBy.charAt(0).toLowerCase() + sortBy.slice(1)
+    sortBy = sortBy + 'Quartiles'
+    ret = a[sortBy][1] < b[sortBy][1] ? -1 : 1
+  } else if (sortBy === 'medianCpuTime') {
+    sortBy = 'cpuTimeQuartiles'
+    ret = a[sortBy][1] < b[sortBy][1] ? -1 : 1
+  } else {
+  // All non median sorts
+    ret = a[sortBy] < b[sortBy] ? -1 : 1
+  }
+  return sortDesc ? -ret : ret
+}
+
+export function formatChartLabels (timingOption) {
+  // Create correct labels for the charts
+  if (timingOption.toLowerCase() === 'maxrss') {
+    return 'Max RSS'
+  } else if (timingOption === 'cpuTime' || timingOption === 'CpuTime') {
+    return 'CPU Time'
+  } else {
+    return upperFirst(timingOption) + ' Time'
+  }
+}
 
-    return dayss +
-      hours.toString().padStart(2, '0') +
-      ':' + minutes.toString().padStart(2, '0') +
-      ':' + Math.round(seconds).toString().padStart(2, '0')
+export function getTimingOption (timingOption) {
+  // Create correct timing option for the charts
+  if (timingOption === 'maxRss' || timingOption === 'cpuTime') {
+    return timingOption
+  } else {
+    return timingOption + 'Time'
+  }
+}
+
+export function formatHeader (statistic, timingOption) {
+  if (timingOption === 'MaxRss' || timingOption === 'CpuTime' || timingOption === 'totalCpuTime') {
+    if (statistic === 'quartiles') {
+      return timingOption.charAt(0).toLowerCase() + timingOption.slice(1)
+    } else {
+      return statistic + timingOption
+    }
+  } else {
+    if (statistic === 'quartiles') {
+      return timingOption.toLowerCase()
+    } else {
+      return statistic + timingOption + 'Time'
+    }
   }
-  // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
-  // return "undefined" rather than a number for these cases
-  return undefined
 }
 
 /**
diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index 30d846637..f27382e4c 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -17,7 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <template>
   <div class="c-analysis">
+    <v-skeleton-loader
+      v-if="!Object.keys(callback.tasks).length"
+      type="table"
+      class="align-content-start"
+    />
     <v-container
+      v-else
       fluid
       class="pa-2"
     >
@@ -112,6 +118,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <v-icon :icon="$options.icons.mdiRefresh" />
             <v-tooltip>Refresh data</v-tooltip>
           </v-btn>
+          <v-chip location="right" v-if="timingOption === 'cpuTime'">
+            Total CPU Time: {{
+            formatDuration(tasks[0].totalOfTotals, false, 'cpuTime') }}
+          </v-chip>
           <v-btn>
             <v-icon :icon="$options.icons.mdiInformationOutline" />
             <v-tooltip>
@@ -154,6 +164,7 @@ import {
   pick,
 } from 'lodash'
 import gql from 'graphql-tag'
+import { formatDuration } from '@/utils/tasks'
 import graphqlMixin from '@/mixins/graphql'
 import {
   initialOptions,
@@ -195,7 +206,20 @@ const taskFields = [
   'stdDevQueueTime',
   'minQueueTime',
   'queueQuartiles',
-  'maxQueueTime'
+  'maxQueueTime',
+  'maxMaxRss',
+  'meanMaxRss',
+  'stdDevMaxRss',
+  'minMaxRss',
+  'maxRssQuartiles',
+  'maxCpuTime',
+  'meanCpuTime',
+  'stdDevCpuTime',
+  'minCpuTime',
+  'totalCpuTime',
+  'cpuTimeQuartiles',
+  'totalOfTotals',
+  'memAlloc'
 ]
 
 /** The one-off query which retrieves historical task timing statistics */
@@ -355,7 +379,8 @@ export default {
         this.callback.onAdded(ret.data)
       },
       200 // only re-run this once every 0.2 seconds
-    )
+    ),
+    formatDuration
   },
 
   icons: {
@@ -370,6 +395,8 @@ export default {
     { value: 'totalTimes', title: 'Total times' },
     { value: 'runTimes', title: 'Run times' },
     { value: 'queueTimes', title: 'Queue times' },
+    { value: 'maxRss', title: 'Max RSS' },
+    { value: 'cpuTime', title: 'CPU Time' },
   ],
 }
 </script>
diff --git a/tests/component/specs/boxPlot.cy.js b/tests/component/specs/boxPlot.cy.js
index 2b770d6e8..eddcfe112 100644
--- a/tests/component/specs/boxPlot.cy.js
+++ b/tests/component/specs/boxPlot.cy.js
@@ -113,4 +113,16 @@ describe('BoxPlot', () => {
       .get('.apexcharts-yaxis title')
       .should('have.length', 3)
   })
+  it('shows tooltip', () => {
+    // see: https://on.cypress.io/mounting-vue
+    cy.mount(BoxPlot, merge(mountOpts, {
+      props: {
+        tasks: [task1, task2],
+      },
+    }))
+    cy.get('.vue-apexcharts')
+      .trigger('mousemove', { clientX: 100, clientY: 100 })
+      .get('.apexcharts-tooltip')
+      .should('be.visible')
+  })
 })
diff --git a/tests/e2e/specs/analysis.cy.js b/tests/e2e/specs/analysis.cy.js
index f1b3de733..b0d941d8c 100644
--- a/tests/e2e/specs/analysis.cy.js
+++ b/tests/e2e/specs/analysis.cy.js
@@ -16,7 +16,6 @@
  */
 
 import { analysisTaskQuery } from '@/services/mock/json/index.cjs'
-import { clone } from 'lodash'
 
 const sortedTasks = analysisTaskQuery.data.tasks.map(({ name }) => name).sort()
 
@@ -138,6 +137,20 @@ describe('Analysis view', () => {
         cy
           .get('.c-analysis table > tbody > tr')
           .should('have.length', numTasks)
+        // Show Max RSS
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('Max RSS')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('MB')
+        cy
+          .get('.c-analysis table > tbody > tr')
+          .should('have.length', numTasks)
       })
 
       it('Should filter by task name, platform and timings', () => {
@@ -213,6 +226,43 @@ describe('Analysis view', () => {
           .should('have.length', 1)
           .should('be.visible')
       })
+      it('Should show Max RSS', () => {
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('Max RSS')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('MB')
+          .should('be.visible')
+        cy
+          .get('.c-analysis table > tbody > tr')
+          .should('have.length', numTasks)
+          .should('be.visible')
+        cy
+          .get('.v-chip__content')
+          .should('not.exist')
+      })
+      it('Should show CPU Time', () => {
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('CPU Time')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('00:00:10')
+          .should('be.visible')
+        cy
+          .get('.v-chip__content')
+          .should('exist')
+          .contains('CPU Time')
+      })
     })
   })
 
@@ -238,6 +288,38 @@ describe('Analysis view', () => {
         .get('.vue-apexcharts')
         .should('not.exist')
     })
+    it('Should show Max RSS', () => {
+      cy
+        .get('#c-analysis-filter-task-timings')
+        .click({ force: true })
+      cy
+        .get('.v-list-item')
+        .contains('Max RSS')
+        .click({ force: true })
+      cy
+        .get('.apexcharts-yaxis-label')
+        .should('have.length', numTasks)
+      cy
+        .get('.apexcharts-xaxis-label')
+        .contains('MB')
+        .should('be.visible')
+    })
+    it('Should show CPU Time', () => {
+      cy
+        .get('#c-analysis-filter-task-timings')
+        .click({ force: true })
+      cy
+        .get('.v-list-item')
+        .contains('CPU Time')
+        .click({ force: true })
+      cy
+        .get('.apexcharts-yaxis-label')
+        .should('have.length', numTasks)
+      cy
+        .get('.apexcharts-xaxis-label')
+        .contains('00:00:00')
+        .should('be.visible')
+    })
 
     it('refreshes without getting bogus apexcharts error', () => {
       // https://github.com/apexcharts/vue3-apexcharts/issues/79
@@ -258,7 +340,7 @@ describe('Analysis view', () => {
         .then((els) => {
           expect(
             Array.from(els, (i) => i.textContent)
-          ).to.deep.equal(sortedTasks)
+          ).to.deep.equal(['eventually_succeeded', 'succeeded', 'waiting'])
         })
       cy.get('[data-cy=box-plot-sort]')
         .click()
@@ -266,7 +348,7 @@ describe('Analysis view', () => {
         .then((els) => {
           expect(
             Array.from(els, (i) => i.textContent)
-          ).to.deep.equal(clone(sortedTasks).reverse())
+          ).to.deep.equal(['waiting', 'succeeded', 'eventually_succeeded'])
         })
     })
   })
@@ -554,5 +636,29 @@ describe('Filters and Options save state', () => {
         .get('[data-cy="box-plot-sort-select"]')
         .should('be.visible')
     })
+    it('displays correct tooltip content for box plot', () => {
+      cy.get('.c-analysis [data-cy=box-plot-toggle]').click()
+      cy.get('[data-cy=box-plot-chart] .apexcharts-series path')
+        .first()
+        .trigger('mouseover', { force: true })
+        .trigger('mousemove', { force: true })
+
+      // Check tooltip content
+      cy.get('.apexcharts-tooltip')
+        .should('be.visible')
+        .contains('Maximum: 00:00:33')
+      cy.get('.apexcharts-tooltip')
+        .contains('Median')
+      cy.get('.apexcharts-tooltip')
+        .contains('Minimum')
+      // If timingOption is maxRss, check for Memory Allocated
+      cy.get('#c-analysis-filter-task-timings')
+        .invoke('val')
+        .then(val => {
+          if (val === 'Max RSS') {
+            cy.get('.apexcharts-tooltip').contains('Memory Allocated')
+          }
+        })
+    })
   })
 })
diff --git a/tests/unit/utils/tasks.spec.js b/tests/unit/utils/tasks.spec.js
index 956ae12e4..88a5c3120 100644
--- a/tests/unit/utils/tasks.spec.js
+++ b/tests/unit/utils/tasks.spec.js
@@ -112,8 +112,8 @@ describe('tasks', () => {
       expect(formatDuration(0)).to.equal(undefined)
     })
     it('should change format of 0 seconds based on value of allowZeros', () => {
-      expect(formatDuration(0, { allowZeros: false })).to.equal(undefined)
-      expect(formatDuration(0, { allowZeros: true })).to.equal('00:00:00')
+      expect(formatDuration(0, false)).to.equal(undefined)
+      expect(formatDuration(0, true)).to.equal('00:00:00')
     })
     it('should not change format of non-zero values based on allowZeros', () => {
       expect(formatDuration(42)).to.equal('00:00:42')