JSON parser changes

Beginning to move all functionality of the JSON parser to a utility
class.