Progress:
* enums for types