move things around. gracefully clean up things on a per check basis.