Some additions to make a JSON report. Still a WIP