support containment, closes #1