Need to change to an array of structs
Change to array of structs