Lots of changes and new files for reporting structure.