Fixed a bit of container classes dataclass stuff.  Not done yet.
Working on the addons (which I am now calling extensions) portion.