Part 1 of switch/case to enuam refactor