Implement deletes
Generic exception handling
Refactor testing