Topic/quarantine

I haven't tested this thoroughly. I'm submitting the pull request because I think we both need to test it.