Organized the hive generation a bit