big chunk of changes for Beta - follow container, copy text etc