Adding picks to containers

Simple.
This isn't part of the larger work of adding the container as this makes it much easier to test properly (using code's front tool).