Updated Json to be a bit better, need to verify with Phelan that this is the proper format