I'll split out this into a separate commit to explain it