new classifier
API work
classification work and general cleanup