Add better add/delete methods. Reduce code isn't quite right yet.