@xchrdw do you plan on doing this and if, will it be in this PR?