Made Reporting somewhat work