add support for removing a container
allow for extra attributes to be set on Image

not super clean, but a start