Refactor to introduce container type
Move container code out to container.go