Work in progress: Added struct to display data