some progress on the containrs stuff, incomplete