added assignees
combined models
Merge branch 'eldons' into david