finish models
Merge branch 'master' into add-dropdown-selection-to-index