Add, edit, remove functionality working