added generic classifier + rudimentary naive bayes