Anticipates next PR a bit...