Close #184, "more random" crates
Use ContainerCrate on client as well