Updates to modeling from Rick
Merge pull request #1540 from mtedeschi/style-modeling-prototypes

Updates to modeling from Rick