Initial work on reporting
More reporting work