Working on some data structure changes for shinyApp