Lots of changes including reporting