Adding/Deleting functional but not streamlined.