Use improved JSON format

Eventually we'll want to move this out to a presenter but for now this.