Ongoing formatting
Breaking everything to get a TOC working