Patch 23

Working on the tag-based toc...