Refactor so that a classifier now takes a dict instead of a vector