Editing Containers
Work in progress ...