continue to add models
Merge branch 'master' into chantal