The current tree-style design is, hmm . . . not optimal.