Add/Edit/Delete now works