Cool, agreed. Should we do that before this PR lands?