WIP - Enhance report

WIP - Enhance report
Y U NO INDENT GUD?