More changes to a recursive structure.  I don't think this is actually necessary though... can probably delete this branch [ph]