Start off a nicer container view, mostly plumbing work