diff --git a/Car.java b/Car.java
index ca1d82c..3b6e6bf 100644
--- a/Car.java
+++ b/Car.java
@@ -14,10 +14,22 @@ public int getSeats() {
   public void doATurboBoost() {
     speedInKmh *= 2;
     System.out.println(
-        getMake() + " " + getModel() + " macht einen Turboboost und beschleunigt auf " + speedInKmh + " km/h");
+        getMake()
+            + " "
+            + getModel()
+            + " macht einen Turboboost und beschleunigt auf "
+            + speedInKmh
+            + " km/h");
   }
 
   public String toString() {
-    return getMake() + " " + getModel() + " (" + getEngine().getDescription() + ", " + seats + " Sitzplaetze)";
+    return getMake()
+        + " "
+        + getModel()
+        + " ("
+        + getEngine().getDescription()
+        + ", "
+        + seats
+        + " Sitzplaetze)";
   }
 }
diff --git a/Exercise.java b/Exercise.java
index 8255262..2d4d392 100644
--- a/Exercise.java
+++ b/Exercise.java
@@ -1,7 +1,7 @@
 public class Exercise {
 
   public static void main(String[] args) {
-    System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles());
+    Rental rental = new Rental("Fahrzeugvermietung Mueller");
 
     Car car1 = new Car("Porsche", "911", Engine.ELECTRO, 2);
     Truck truck1 = new Truck("MAN", "TGX", Engine.DIESEL, 20);
@@ -17,5 +17,10 @@ public static void main(String[] args) {
     truck1.transform();
     car1.doATurboBoost();
     truck1.transform();
+    rental.addVehicle(car1);
+    rental.addVehicle(truck1);
+    rental.addVehicle(car2);
+
+    System.out.println(rental.toString());
   }
 }
diff --git a/Rental.java b/Rental.java
new file mode 100644
index 0000000..218eb37
--- /dev/null
+++ b/Rental.java
@@ -0,0 +1,38 @@
+import java.util.ArrayList;
+
+public class Rental {
+
+  private final String name;
+  private final ArrayList<Vehicle> vehicles;
+
+  public Rental(String name) {
+    this.name = name;
+    vehicles = new ArrayList<>();
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public ArrayList<Vehicle> getVehicles() {
+    return vehicles;
+  }
+
+  public void addVehicle(Vehicle vehicle) {
+    vehicles.add(vehicle);
+  }
+
+  public void addAllVehicles(Vehicle... vehicles) {
+    for (Vehicle v : vehicles) {
+      this.vehicles.add(v);
+    }
+  }
+
+  public String toString() {
+    String result = name + "\n" + "Unsere Fahrzeuge: \n";
+    for (Vehicle vehicle : vehicles) {
+      result += vehicle.toString() + "\n";
+    }
+    return result;
+  }
+}
diff --git a/Truck.java b/Truck.java
index c6f82c7..ae110f6 100644
--- a/Truck.java
+++ b/Truck.java
@@ -18,7 +18,8 @@ public boolean isTransformed() {
 
   public void transform() {
     if (isTransformed) {
-      System.out.println(getMake() + " " + getModel() + " verwandelt sich in einen Lastwagen zurueck");
+      System.out.println(
+          getMake() + " " + getModel() + " verwandelt sich in einen Lastwagen zurueck");
     } else {
       System.out.println(getMake() + " " + getModel() + " verwandelt sich in einen Autobot");
     }