anadrome Refactor to more easily support various ToCs

Latest commit dc0ec39

Mar 23, 2018