crud refactored
crud refactor done