More work on class Vectorizer.
Final work on class Vectorizer.