New data structure compiles and reads correctly now