Enum status

Please update with the results of the enum-status branch