Modal stuff
Merge pull request #1021 from brooksryba/develop

Develop