Started to modify the generated CRUD(s) into the final things