Debugging some of the classes, more work to be done on the output tree