diff --git a/src/main/java/org/model/ElectricCar.java b/src/main/java/org/model/ElectricCar.java
index 2ee9bd8..8741382 100644
--- a/src/main/java/org/model/ElectricCar.java
+++ b/src/main/java/org/model/ElectricCar.java
@@ -27,13 +27,35 @@ public class ElectricCar extends Car implements Chargeable {
         this.chargeLevel = chargeLevel;
     }
 
-    // TODO: Override getEnergyType() → return "Electric"
+    @Override
+    public String getEnergyType() {return "Electric";}
+    
+    //Implement Chargeable
+    public void charge(double amount) {
+        if (amount <= 0) {
+            System.out.println("Invalid amount!");
+            return;
+        }
+        if (chargeLevel + amount > 100) {System.out.println("Invalid amount!");}
+        else {System.out.println("Refuelable!");}
+    }
 
-    // TODO: Override showDetails()
-    // Call super.showDetails()
-    // Print battery capacity and charge level
+    @Override
+    public void showDetails() {
+        super.showDetails();
+        System.out.println(batteryCapacity);
+        System.out.println(chargeLevel);
+    }
 
-    // TODO: Implement charge(double amount)
-    // Validate negative
-    // Cap at 100
+    @Override
+    public boolean needsService(Vehicle v) {
+        double mileage = v.getMileage();
+        return (mileage > 8000);
+    }
+
+    @Override
+    public void performService() {
+        System.out.println("Battery system checked");
+        chargeLevel = 100;
+    }
 }