WIP on TableOfCOntents continues