More work on classifying.