Basically finished with closures. On to cleanup