Version 2 add, edit, delete all working