Refactor so that teardown isn't needed anymore.
Support progress.