diff --git a/src/main/java/org/Main.java b/src/main/java/org/Main.java
index 7a3d8c8..3131d7b 100644
--- a/src/main/java/org/Main.java
+++ b/src/main/java/org/Main.java
@@ -1,8 +1,30 @@
 package org;
 
+import org.behavior.Serviceable;
+import org.model.ElectricCar;
+import org.model.GasCar;
+import org.model.SportsCar;
+import org.model.Vehicle;
+import org.util.VehicleInspector;
+
+import java.util.ArrayList;
+
 public class Main {
     public static void main(String[] args) {
+        ElectricCar tesla = new ElectricCar(
+                "Tesla", "Model S", 2022, 1000,
+                100, 550, 50   // batteryCapacity, range
+        );
 
+        GasCar toyota = new GasCar(
+                "Toyota", "Corolla", 2018, 85000,
+                5, 50, "Petrol"   // seats, fuelCapacity, fuelType
+        );
+
+        SportsCar ferrari = new SportsCar(
+                "Ferrari", "F8 Tributo", 2021, 12000,
+                2, 3.9, "oil", 710   // seats, engineSize, horsepower
+        );
         // ============================================================
         // TODO 1:
         // Create one instance of each vehicle type:
@@ -18,9 +40,10 @@ public class Main {
         // ============================================================
 
 
-
-
-
+        ArrayList<Vehicle> vehicles = new ArrayList<>();
+        vehicles.add(tesla);
+        vehicles.add(toyota);
+        vehicles.add(ferrari);
         // ============================================================
         // TODO 2:
         // Create an array of Vehicle:
@@ -35,7 +58,10 @@ public class Main {
 
 
 
-
+        for (Vehicle v: vehicles) {
+            v.basicInfo();
+            System.out.print("\n");
+        }
         // ============================================================
         // TODO 3:
         // Loop through the Vehicle[] array and:
@@ -50,7 +76,9 @@ public class Main {
 
 
 
-
+        for (Vehicle v: vehicles) {
+            VehicleInspector.inspect(v);
+        }
         // ============================================================
         // TODO 4:
         // Use VehicleInspector to inspect each vehicle:
@@ -65,7 +93,10 @@ public class Main {
 
 
 
-
+        ArrayList<Serviceable> serviceables= new ArrayList<>();
+        serviceables.add(tesla);
+        serviceables.add(toyota);
+        serviceables.add(ferrari);
         // ============================================================
         // TODO 5:
         // Create an array of Serviceable:
@@ -83,7 +114,17 @@ public class Main {
 
 
 
-
+        for (Serviceable s: serviceables) {
+            Vehicle v = (Vehicle) s;
+            if(s.needsService(v)) {
+                System.out.println("Brand: " + v.getBrand() +", model: " +
+                        v.getModel());
+                s.performService();
+            } else {
+                System.out.println("The car does not need service");
+            }
+            System.out.print("\n");
+        }
         // ============================================================
         // TODO 6:
         // Loop through the Serviceable[] array:
@@ -107,9 +148,7 @@ public class Main {
         // ============================================================
 
 
-
-
-
+        System.out.println("=== Workshop Completed ===");
         // ============================================================
         // TODO 7 (Optional):
         // After everything is done, print a final message:
diff --git a/src/main/java/org/model/Car.java b/src/main/java/org/model/Car.java
index 74836b5..8c93b47 100644
--- a/src/main/java/org/model/Car.java
+++ b/src/main/java/org/model/Car.java
@@ -17,16 +17,29 @@ public abstract class Car extends Vehicle implements Serviceable {
 
     public Car(String brand, String model, int year,
                double mileage, int seats) {
-
+        super(brand, model, year, mileage);
         // TODO: Call super constructor
         this.seats = seats;
     }
 
+    @Override
+    public String getEnergyType() {
+        return "Unknown";
+    }
     // TODO: Override getEnergyType() → return "Unknown"
 
+    @Override
+    public void showDetails() {
+        System.out.println("Car details: brand: " + this.getBrand() + ", model: "
+                + this.getModel() + ", year: " + this.getYear() + ", mileage: "
+                + this.getMileage() + ", number of seats: " + this.seats);
+    }
     // TODO: Override showDetails()
     // Print brand, model, year, mileage, and number of seats
 
+    public boolean needService(Vehicle v) {
+        return v.getMileage() > 10000;
+    }
     /*
      * Implement Serviceable methods:
      *
@@ -34,8 +47,11 @@ public abstract class Car extends Vehicle implements Serviceable {
      * - Check the mileage of the current car
      * - If mileage > 10000 return true
      * - Otherwise return false
-     *
-     * performService():
+     */
+    public void performService() {
+        System.out.println("General car service completed");
+    }
+     /* performService():
      * - Print: "General car service completed"
      */
 }
diff --git a/src/main/java/org/model/ElectricCar.java b/src/main/java/org/model/ElectricCar.java
index 2ee9bd8..840edef 100644
--- a/src/main/java/org/model/ElectricCar.java
+++ b/src/main/java/org/model/ElectricCar.java
@@ -26,13 +26,36 @@ public class ElectricCar extends Car implements Chargeable {
         this.batteryCapacity = batteryCapacity;
         this.chargeLevel = chargeLevel;
     }
-
+    public boolean needsService(Vehicle v) {
+        return v.getMileage() > 8000;
+    }
+    public void performService() {
+        System.out.println("Battery system checked");
+        this.chargeLevel = 100;
+    }
+    @Override
+    public String getEnergyType() {
+        return "Electric";
+    }
     // TODO: Override getEnergyType() → return "Electric"
 
+    @Override
+    public void showDetails() {
+        super.showDetails();
+        System.out.println("Battery capacity: " + this.batteryCapacity + ", Charge level: " +
+                this.chargeLevel);
+    }
     // TODO: Override showDetails()
     // Call super.showDetails()
     // Print battery capacity and charge level
 
+    public void charge(double amount) {
+        if (amount > 0 && this.chargeLevel + amount <= 100) {
+            this.chargeLevel += amount;
+        } else if (amount > 0 && this.chargeLevel + amount > 100) {
+            this.chargeLevel = 100; //if input amount causes the battery to charge pass 100%, we set it to 100%.
+        }
+    }
     // TODO: Implement charge(double amount)
     // Validate negative
     // Cap at 100
diff --git a/src/main/java/org/model/GasCar.java b/src/main/java/org/model/GasCar.java
index 2109f93..fb9f215 100644
--- a/src/main/java/org/model/GasCar.java
+++ b/src/main/java/org/model/GasCar.java
@@ -27,12 +27,37 @@ public class GasCar extends Car implements Refuelable {
         this.fuelType = fuelType;
     }
 
+    public boolean needsService(Vehicle v) {
+        return v.getMileage() > 8000;
+    }
+    public void performService() {
+        System.out.println("Engine oil changed");
+        this.fuelLevel = 100;
+    }
+
+    @Override
+    public String getEnergyType() {
+        return this.fuelType + " (Gas)";
+    }
     // TODO: Override getEnergyType() → return fuelType + " (Gas)"
 
+
+    public void refuel(double amount) {
+        if (amount > 0 && this.fuelLevel + amount <= 100) {
+            this.fuelLevel += amount;
+        } else if (amount > 0 && this.fuelLevel + amount > 100) {
+            this.fuelLevel = 100; //if input amount causes the fuel to fill pass 100%, we set it to 100%.
+        }
+    }
     // TODO: Implement refuel(double amount)
     // Validate amount
     // Cap at 100
 
+    @Override
+    public void showDetails() {
+        super.showDetails();
+        System.out.println("Feul level: " + this.fuelLevel + ", Feul type: " + this.fuelType);
+    }
     // TODO: Override showDetails()
     // Call super.showDetails()
     // Print fuel level and fuel type
diff --git a/src/main/java/org/model/HybridCar.java b/src/main/java/org/model/HybridCar.java
new file mode 100644
index 0000000..0ec7097
--- /dev/null
+++ b/src/main/java/org/model/HybridCar.java
@@ -0,0 +1,44 @@
+package org.model;
+
+import org.behavior.Chargeable;
+import org.behavior.Refuelable;
+
+public class HybridCar extends Car implements Chargeable, Refuelable {
+    private int batteryCapacity;
+    private double chargeLevel;
+    private double fuelLevel;
+    private String fuelType;
+
+    public HybridCar(String brand, String model, int year, double mileage,
+                     int seats, int batteryCapacity, double chargeLevel,
+                     double fuelLevel, String fuelType) {
+        super(brand, model, year, mileage, seats);
+        this.batteryCapacity = batteryCapacity;
+        this.chargeLevel = chargeLevel;
+        this.fuelLevel = fuelLevel;
+        this.fuelType = fuelType;
+    }
+
+    public boolean needsService(Vehicle v) {
+        return v.getMileage() > 10000;
+    }
+    public void performService() {
+        System.out.println("Engine oil changed and battery system checked");
+        this.chargeLevel = 100;
+        this.fuelLevel = 100;
+    }
+    public void charge(double amount) {
+        if (amount > 0 && this.chargeLevel + amount <= 100) {
+            this.chargeLevel += amount;
+        } else if (amount > 0 && this.chargeLevel + amount > 100) {
+            this.chargeLevel = 100; //if input amount causes the battery to charge pass 100%, we set it to 100%.
+        }
+    }
+    public void refuel(double amount) {
+        if (amount > 0 && this.fuelLevel + amount <= 100) {
+            this.fuelLevel += amount;
+        } else if (amount > 0 && this.fuelLevel + amount > 100) {
+            this.fuelLevel = 100; //if input amount causes the fuel to fill pass 100%, we set it to 100%.
+        }
+    }
+}
diff --git a/src/main/java/org/model/SportsCar.java b/src/main/java/org/model/SportsCar.java
index 25f5df9..6143ef9 100644
--- a/src/main/java/org/model/SportsCar.java
+++ b/src/main/java/org/model/SportsCar.java
@@ -23,7 +23,17 @@ public class SportsCar extends GasCar {
 
         this.zeroToHundred = zeroToHundred;
     }
+    public boolean needsService(Vehicle v) {
+        return v.getMileage() > 5000;
+    }
+    public void performService() {
+        System.out.println("High-performance brake system checked");
+    }
 
+    public void showDetails() {
+        super.showDetails();
+        System.out.println("Acceleration time: " + this.zeroToHundred);
+    }
     // TODO: Override showDetails()
     // Call super.showDetails()
     // Print acceleration time
diff --git a/src/main/java/org/model/Vehicle.java b/src/main/java/org/model/Vehicle.java
index 70615a9..72d70ef 100644
--- a/src/main/java/org/model/Vehicle.java
+++ b/src/main/java/org/model/Vehicle.java
@@ -20,14 +20,37 @@ public abstract class Vehicle {
         this.mileage = mileage;
     }
 
+    public String getBrand() {
+        return brand;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public double getMileage() {
+        return mileage;
+    }
+
     // TODO: Create getters for all fields
 
+    public void addMileage(double km) {
+        if (km < 0) {
+            System.out.println("error");
+            return;
+        }
+        this.mileage += km;
+    }
     // TODO: Implement addMileage(double km)
     // If km is negative → print error
     // Otherwise increase mileage
 
+    public abstract String getEnergyType();
     // TODO: Declare abstract method getEnergyType()
-
     public void basicInfo() {
         System.out.println(
                 year + " " + brand + " " + model +
diff --git a/src/main/java/org/util/VehicleInspector.java b/src/main/java/org/util/VehicleInspector.java
index c83c420..2b69c32 100644
--- a/src/main/java/org/util/VehicleInspector.java
+++ b/src/main/java/org/util/VehicleInspector.java
@@ -1,6 +1,9 @@
 package org.util;
 
 import org.*;
+import org.model.ElectricCar;
+import org.model.GasCar;
+import org.model.SportsCar;
 import org.model.Vehicle;
 
 /*
@@ -14,6 +17,13 @@ public class VehicleInspector {
 
         v.basicInfo();
 
+        if (v instanceof ElectricCar) {
+            System.out.println("Check battery system");
+        } else if (v instanceof SportsCar) {
+            System.out.println("Check brakes and performance");
+        } else if (v instanceof GasCar) {
+            System.out.println("Check engine and oil");
+        }
         // TODO:
         // If ElectricCar → print "Check battery system"
         // If SportsCar → print "Check brakes and performance"