A36507 V 0.4.4

Working on getting new data structures to work