Mostly changed and fixes properties, now a .json file