Added delete and helpers to go with it.