Refactored, PUT and DELETE should work