some refactoring. Most importantly note that the sexes and intoxState enums now are prefixed to avoid collisions