First version of new data structures completed for testing