Makes sense, will revisit this after your branch gets merged in.