Deletetion framework

Counts towards #80 & #29
Closes #88