Getting closer to a proper report