Feature/ordinals