Worked on the ToC.
Merged.
Added ToC markup to template.