Did some restructuring. Tested vectorizer. Doesn't quite work