JSON

Just the initial JSON changes that Shaheed made, more to follow.