Now handles delete and list