Ann types & tests for new enum methods.
Implement all the new enumerators.

Closes #11