Finished ClassDiscovery2, I think. Integration is next, then removal of ClassDiscovery, and rename ClassDiscovery2.