Changed up JSON some more, for simplicity and parsimony