[UPDATE] Add in get / set of json values to allow for better error handl...

...ing