Major Changes to the generating of Json files, needs more work though