Some more work on the json