Working on testing container.  Fixed dataclass up.  I have plans to completely revamp dataclass in general though.  That is where I am going now.