diff --git a/src/main/java/shape/tp5/Drawer.java b/src/main/java/shape/tp5/Drawer.java
new file mode 100644
index 0000000000000000000000000000000000000000..d46422e13ea38b6ec66da10177eea3861527a1ff
--- /dev/null
+++ b/src/main/java/shape/tp5/Drawer.java
@@ -0,0 +1,37 @@
+package shape.tp5;
+
+import javafx.scene.canvas.Canvas;
+import javafx.scene.canvas.GraphicsContext;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Drawer extends Canvas {
+    private List<Shape> shapes;
+
+    public Drawer(double width, double height) {
+        super(width, height);
+        shapes = new ArrayList<>();
+    }
+
+    public void add(Shape shape) {
+        shapes.add(shape);
+        repaint();
+    }
+
+    public void repaint() {
+        GraphicsContext gc = getGraphicsContext2D();
+        gc.clearRect(0, 0, getWidth(), getHeight());
+        for (Shape shape : shapes) {
+            shape.paint(gc);
+        }
+    }
+
+    public Shape shapeContaining(double x, double y) {
+        for (Shape shape : shapes) {
+            if (shape.contains(x, y)) {
+                return shape;
+            }
+        }
+        return null;
+    }
+}