implements delete method, among other items
fix merge conflicts.