Feature/choice implementation

Should this have a comma at the end?