5-6 Enum class refactored.
5-7 Done.