Working on getting the correct data to display