More work on classes for storing disp. data.

I might have accidently sold my soul to the devil.