diff --git a/_1_basics/src/main/java/code/_3_in_class/ClasaBunaZiua.java b/_1_basics/src/main/java/code/_3_in_class/ClasaBunaZiua.java
new file mode 100644
index 000000000..67683aabf
--- /dev/null
+++ b/_1_basics/src/main/java/code/_3_in_class/ClasaBunaZiua.java
@@ -0,0 +1,8 @@
+package code._3_in_class;
+
+public class ClasaBunaZiua {
+    //psvm
+    public static void main(String[] args) {
+        System.out.println("Buna ziua");
+    }
+}
diff --git a/_1_basics/src/main/java/code/_3_in_class/Main.java b/_1_basics/src/main/java/code/_3_in_class/Main.java
index 3b87b4563..8b9e3e7c0 100644
--- a/_1_basics/src/main/java/code/_3_in_class/Main.java
+++ b/_1_basics/src/main/java/code/_3_in_class/Main.java
@@ -4,5 +4,23 @@ public class Main {
 
     public static void main(String[] args) {
         //TODO put your code changes in here
+        int[] ar = new int[] {1, 2, 3};
+        int[] v1 = ar;
+        int[] v2 = ar;
+        ar[0] = 10;
+        v1[0] = 100;
+        v2[0] = 1000;
+
+        displayVector("arr",ar);
+        displayVector("v1",v1);
+        displayVector("v2",v2);
+    }
+
+    public static void displayVector(String name, int[] arr) {
+        System.out.println(name + " = ");
+        for(int i = 0; i < arr.length; i++){
+            System.out.println(arr[i]+" ");
+        }
+        System.out.println();
     }
 }
\ No newline at end of file
diff --git a/_2_oo/src/main/java/code/_3_in_class/Boxer.java b/_2_oo/src/main/java/code/_3_in_class/Boxer.java
new file mode 100644
index 000000000..e3ec142f7
--- /dev/null
+++ b/_2_oo/src/main/java/code/_3_in_class/Boxer.java
@@ -0,0 +1,30 @@
+package code._3_in_class;
+
+public class Boxer {
+
+    String nume;
+    int health = 100;
+    int damagePerAttack = 10;
+
+
+
+    public Boxer(String nume, int health, int damagePerAttack) {
+        this.nume = nume;
+        this.health = health;
+        this.damagePerAttack = damagePerAttack;
+    }
+
+    public Boxer(String nume) {
+        this.nume = nume;
+    }
+
+
+    void attack(Boxer opponent){
+        opponent.health = opponent.health - this.damagePerAttack;
+        System.out.println(this.nume + " il ataca pe "+ opponent.nume+" - new health is: "+ this.health);
+    }
+    void defend(){
+
+    }
+
+}
diff --git a/_2_oo/src/main/java/code/_3_in_class/BruceLee.java b/_2_oo/src/main/java/code/_3_in_class/BruceLee.java
new file mode 100644
index 000000000..d8c3bf6f7
--- /dev/null
+++ b/_2_oo/src/main/java/code/_3_in_class/BruceLee.java
@@ -0,0 +1,18 @@
+package code._3_in_class;
+
+import javax.swing.*;
+
+public class BruceLee extends Boxer {
+
+    public BruceLee(String nume, int health, int damagePerAttack) {
+        super(nume, health, damagePerAttack);
+    }
+
+    public BruceLee(String nume) {
+        super(nume);
+    }
+    void attack(Boxer opponent) {
+        opponent.health = 0;
+        System.out.println(this.nume + " il ataca pe "+ opponent.nume+" - new health is: "+ this.health);
+    }
+}
diff --git a/_2_oo/src/main/java/code/_3_in_class/Main.java b/_2_oo/src/main/java/code/_3_in_class/Main.java
index 3b87b4563..31e1c04e2 100644
--- a/_2_oo/src/main/java/code/_3_in_class/Main.java
+++ b/_2_oo/src/main/java/code/_3_in_class/Main.java
@@ -1,8 +1,34 @@
 package code._3_in_class;
 
+import java.util.Random;
+
 public class Main {
 
     public static void main(String[] args) {
         //TODO put your code changes in here
+        Boxer ion = new Boxer("ion", 100, 10);
+        Boxer vasile = new Boxer("vasile");
+        Boxer bruceLee = new BruceLee("bruce lee");
+        startBoxingMatch(ion, bruceLee);
+        announceVictory(ion, bruceLee);
+    }
+
+    private static void startBoxingMatch(Boxer ion, Boxer vasile) {
+        Random random = new Random();
+        while (ion.health > 0 && vasile.health > 0) {
+            int zeroOrOne = random.nextInt(2);
+            if (zeroOrOne == 0) {
+                ion.attack(vasile);
+            } else {
+                vasile.attack(ion);
+            }
+        }
+    }
+    private static void announceVictory(Boxer b01, Boxer b02) {
+        if (b01.health <= 0) {
+            System.out.println(b02.nume +" a castigat");
+        } else {
+            System.out.println(b01.nume +" a castigat");
+        }
     }
 }
\ No newline at end of file