Entity Type Enumeration

I haven't compiled this, it may be full of errors...