Implement Required Functionality

All Tests Green - including two additional tests, which ensure the correct object structures are returned when generating reports.