Enums almost work.

Switch statements currently off by 1