I'll save that for a subsequent PR...