Working on Getting new data structures to work