Part of fabric ready for #31, up to container.ts