I'm putting this on a separate branch, should be gone from the PR soon (json_xml is the new branch)