Wip/modals

I'm a little lost on why these fs.js changes are in this PR - but as long as these changes are headed in the direction we want to end up it's fine. If we're undeleting stuff we wanted to stay deleted then maybe we want to take this out.