Fleshing out the TOC