good point; as discussed this requires some more changes, so will close and create a new one.