redid enums. integration tests now pass