diff --git a/src/main/java/shape/Rectangle.java b/src/main/java/shape/Rectangle.java
index b0e90627b6345f22ac31ab8bf5fb40f81e4d4f66..5bdf9ce085d242e4b31ea2a148098123bd6723a4 100644
--- a/src/main/java/shape/Rectangle.java
+++ b/src/main/java/shape/Rectangle.java
@@ -4,10 +4,12 @@ import javafx.geometry.Point2D;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 
-public class Rectangle implements Shape{
+public class Rectangle extends AbstractShape{
     Color color;
     Rectangle(Color color, Point2D point0, Point2D point1){
         this.color = color;
+        addPoints(point0);
+        addPoints(point1);
     }
 
     @Override
@@ -21,7 +23,14 @@ public class Rectangle implements Shape{
     }
 
     @Override
-    public void draw(GraphicsContext context) {
+    public void draw(GraphicsContext graphiccontext) {
+        graphiccontext.setFill(color);
+        Point2D p0 = points.get(0);
+        Point2D p1 = points.get(1);
+        graphiccontext.setFill(color);
+        graphiccontext.fillRect(p0.getX(), p0.getY(), p1.getX() - p0.getX(), p1.getY() - p0.getY());
 
     }
+
+
 }