Working on getting the json correct