ok, ignore me, brain now working properly. I think the last commit does what you suggested.