SAM Model Updates
Merge branch 'jon' into sprint16