More work on container management - far from complete