Add some underscore goodness and a quick chooser prototype.
Merge, un-hose some things in questions.