Adding delete capability (WIP)