[DO NOT MERGE] Added a better way to get the choices

closes #722