Almost, I will be testing my last commit tonight (if I did no mistake along the
way). I'll have a look at the patch after that.