Reporting function works. Just need to make it pretty now
Merge branch 'refs/heads/john'