started to add stuff for new containers, but cut short