updated data loading scripts
updated data loading scripts2
updated app to use new data
updated app to use new data2