Mark's selection-menu stuff

tree: 5a2859a, parent commit: 9790842

tree: 5a2859aee375c3e5719b3b18151476c876beaaa2
parent commit: 979084213ac7181d78a2704ce1a2cba47fa6c45b