Added stuff for loading in json files