Makes sense and yes, it works to use those existing options, I will use that then.

> Some of the functionality in this system isn't tested yet, but if you could add tests for your changes, that would be great

Sure thing!