Almost working...
Cleanup.