Add choices field to model
Update chucho to respect editable fields