WIP: get container to work correctly