Fleshed out the TOC