This will be at least deferred to the branch (json_xml) that I just split off.