Allow characterization as a selectable type

Looks like this picked up a couple of extra commits - @Hwesta, should these be in the master branch? I'll clean 'em up.