Added new enums, program now compiles (except for tests), but doesnt work as expected yet