testing out modals
added more modals
small changes
merge conflicts