Still more classifier work