#358 Have concept and mapping expansions working. Tweaked that menu.