updated ch3 stuff to enums
Merge pull request #276 from jcotrel/master

updated ch3 stuff to enums