Updated enums
Moved stuff together
Updated enums