@manton @jean Grateful for your work on this!