merged upstream, fleshed out json array