[WIP] new json output

The integration point is still pretty hacky, and Topic block hasn't
been updated yet.

Change-Id: I36f00631d2080751d9490f386be50eeaa0b38f09