Changed JSON to store all data instead of what we think we will need