Feature/issue 174 matrix choice

Fixes #174.

Needs some design work, and needs the following auto-complete list question (#191).