Naive thing still works, I broke the cleanup but will fix