WIP: FeatureVector: Separate out doc-only features
WIP: More separating out doc-only features