Data structures in place

The data structures seem to be in place and working.