PR Checklist

This PR is up to date with the development branch, and merge conflicts have been resolved
I have executed npm run test-frontend and all tests have passed successfully or I have included details within my PR on the failure
I have executed npm run lint and resolved any outstanding errors. Most issues can be solved by executing npm run format
My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
My changes generate no new warnings

Provide feedback