diff --git a/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java b/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java
new file mode 100644
index 0000000000000000000000000000000000000000..e08f503bcd09c66976557f12849d648d368a8fd5
--- /dev/null
+++ b/src/main/java/es/uvigo/esei/daa/rest/PetsResource.java
@@ -0,0 +1,160 @@
+package es.uvigo.esei.daa.rest;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import es.uvigo.esei.daa.dao.DAOException;
+import es.uvigo.esei.daa.dao.PetsDAO;
+import es.uvigo.esei.daa.entities.Pet;
+
+@Path("/pets")
+@Produces(MediaType.APPLICATION_JSON)
+public class PetsResource {
+    private final static Logger LOG = Logger.getLogger(PetsResource.class.getName());
+
+    private final PetsDAO dao;
+
+
+    public PetsResource() {
+        this(new PetsDAO());
+    }
+
+    // Needed for testing purposes
+    PetsResource(PetsDAO dao) {
+        this.dao = dao;
+    }
+
+    @GET
+    @Path("/{id}")
+    public Response get(
+            @PathParam("id") int id
+    ) {
+        try {
+            final Pet pet = this.dao.get(id);
+
+            return Response.ok(pet).build();
+        } catch (IllegalArgumentException iae) {
+            LOG.log(Level.FINE, "Invalid person id in get method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error getting a person", e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
+
+    @GET
+    public Response list() {
+        try {
+            return Response.ok(this.dao.list()).build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error listing pets", e);
+            return Response.serverError().entity(e.getMessage()).build();
+        }
+    }
+
+
+    @POST
+    public Response add(
+            @FormParam("name") String name,
+            @FormParam("kind") String kind,
+            @FormParam("breed") String breed,
+            @FormParam("owner") int owner
+    ) {
+        try {
+            Pet newPet = new Pet(0, name, kind, breed, owner);
+            newPet = this.dao.add(newPet);
+            return Response.ok(newPet).build();
+        } catch (IllegalArgumentException | NullPointerException iae) {
+            LOG.log(Level.FINE, "Invalid pet id in add method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error adding this pet " + name +" breed: "+ breed, e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
+
+    @PUT
+    @Path("/{id}")
+    public Response modify(
+            @PathParam("id") int id,
+            @FormParam("name") String name,
+            @FormParam("kind") String kind,
+            @FormParam("breed") String breed,
+            @FormParam("owner") int owner
+    ) {
+        try {
+            final Pet pet = new Pet(id, name, kind, breed, owner);
+            this.dao.modify(pet);
+
+            return Response.ok(pet).build();
+        } catch (NullPointerException npe) {
+            final String message = "Invalid data for pet" + " id: " + id + " name: " + name + " kind: "
+                    + kind + " breed: " + breed + " owner: " + owner;
+
+            LOG.log(Level.FINE, message);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(message)
+                    .build();
+        } catch (IllegalArgumentException iae) {
+            LOG.log(Level.FINE, "Invalid pet id in modify method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error modifying a pet", e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
+
+    @DELETE
+    @Path("/{id}")
+    public Response delete(
+            @PathParam("id") int id
+    ) {
+        try {
+            this.dao.delete(id);
+
+            return Response.ok(id).build();
+        } catch (IllegalArgumentException iae) {
+            LOG.log(Level.FINE, "Invalid pet id in delete method", iae);
+
+            return Response.status(Response.Status.BAD_REQUEST)
+                    .entity(iae.getMessage())
+                    .build();
+        } catch (DAOException e) {
+            LOG.log(Level.SEVERE, "Error deleting a pet", e);
+
+            return Response.serverError()
+                    .entity(e.getMessage())
+                    .build();
+        }
+    }
+}