incremental work - need to rewrite classifier