Add support for differentiating one-off containers

This is a basic start, the API is pretty shonky.