Added a contained-image to ItemContainer

Also added some tests and comments