Added some more debug output.  Refs #7789.
Added one output property.  Refs #7789.
Completed most of the refactoring work.  Refs #7789.