removed discrete choice stuff. just use a dict.