Changed data source such that it is loaded from Data.json and updated relevant code.