Save this for another pull request. Stick to the minimum of changes required for adding a classify method.