NaiveBayes implementation is almost final