Updated names, added more code.
Added more code to parse the JSON.