This sounds good. I wait for Reimar's review and initial acceptance in the tree, so we can see and test the code. I won't write for the next 2 days and afterward I'll review the code myself and will offer any comments.