changes to where the data is loaded, still testing some things out