Cool :) I need to head out, but will be back in an hour or two, and will start on this change. @JSteunou is it okay if I move that change into your PR, or would you prefer to tackle this?