Okay, yeah, @MichaelJ is working on a different system for the ToC. It's a bit wonky.