Major refactor to just copy the JSON objects across, adding new fields we want and removing those we don't want.