Adding delete capability mostly.