Made some modifications to all json files to actually get set function to work better
Some merge problems