Moved over to DoubleBuffer as data storage structure for geometry