Container support

Containers!
Container and File integration work in progress
More file work