User:User-12316399/Technical changes/Further flattening/Container states

coming soon