Add choice for classifier type, add basic self training.