@simeonwillbanks let's :fire: this for now, and ship this PR with just the TOC changes.