Some work on classifier
Fix merge conflicts for classifier