Began final cleanup, added resume