Improve pausing

537 commits, 372 files changed. BOOM