Getting rid of tabbed output for now.  Need to refactor into easier classes for that to work.