Best PA for guiding

I believe that this is now done, and tested via the OT and a test case.
(We may wish to add more test cases for this?)
I'd rather remove commented code, but that's my taste :smile: