A bit of reordering to the report. A couple of rewrites and lots of TODO