Major changes to datastructure.