Reworking the container

Started reworking the Container to use the Containment classes.