Adding envelopes and adding functionality to clean up after deletes