Cleanup...
Fix container and add saving to the CookieBank.