Containers: Basic support.

Closes #260
Closes #261