Done. PS, it was a "a lot" of work: b620c1f9a42f631ae803ad513cc4083a0a60313f