Move reporting to the cli