first draft of models
Merge branch 'develop' into add-models
Enriches vocab data.
finished models