WIP: Refactor to split data loading and display