beginning to work on modals
modal edit settings
modal edit
Merge branch 'francis'
pulled