rename
rename
sort enum values by constant
start handling fields