Greatly simplify cauldron contentsNo longer needs quite so many interfaces. Instead of an extension pattern, it uses a contains pattern
Fix containers not properly parsing