Added some JSON functionality.
blah merge fix