Full commit for new resumeEdit

Still does not have fully functioning image saving. Working on that in new branch.