Finished the rework of enums.