made tests pass, redid enums