Implemented the container type and tests