More abstraction

Using enum instead of integers to differentiate verb form and type.