Containers and stacks

Combining the container/stack branch since it's working now.