Modified to add new classifier - at least make it easier to add.