Adding initial work on the container type.