I updated the datastructure; no comments or tests yet.