Agreed, but how about making that a separate PR after this gets merged? I think it makes the reviews easier so I don't accidentally introduce bugs while trying to add this feature.