Enums almost done