Working on all the json stuff