Changed a lot of classifier stuff