Start work on keeping data in enums.