Work-in-progress switch to new JSON library