Uncommented Statler Submit
Merge branch 'coltons-branch'