Second EnumStove Commit
Second EnumStove Commit attempt 2