Some updates and a start on the report page