Work in progress: Redo container-related logic

This is triggered by #3