major refactoring, adding new classifiers