Add pickled classifier, rework to use that to speed things up