added some of the json stuff