Both reports working, further refactoring required