deletion actually works; now to tidy up and make it better