We can close it for now. I got drawn into other work so never completed this fully, but I can re-open the task if needed.