Revert "Revert "implement part of container""

This reverts commit 91994be41d399dea508f63dd95515bff3332a3dd.