Add deletion and whole bunch of other tasties.