Thanks both for the information, I should be able to work with this and open a appropriate PR when the initial work is done, might take a bit as this will be my first custom part!
What is needed to complete this, I'd like to contribute if needed.
I am so sorry to have missed this, I should make a note of visiting Gitlab more often. It seems very similar to my work, if no testing is required and this change is non-blocking, please merge so we can iterate over it. Otherwise I'll have some time tonight to test/amend this if needed.