I'll leave that for another PR since we need to reshape the narrative as-is.