Add in a whole bunch of JSON related stuffs. This is messy by nature as
this system is being developed along side the existing XML stuff, so
until that's gone, this will be bad to look at