major changes, show/delete/new are working