-Add: enums, and some more validation.