A handful of unpushed changes mostly around reporting