Heather- made and tested HeatherEnum
Merge origin/master