Yes, this is half baked, but I wanted to show where we'd be going (and why ContainerOptions existed even if empty). I can remove altogether, or comment, as you see fit.