diff --git a/Main.class b/Main.class
new file mode 100644
index 0000000..4a07dba
Binary files /dev/null and b/Main.class differ
diff --git a/Main.java b/Main.java
new file mode 100644
index 0000000..d8bdbb7
--- /dev/null
+++ b/Main.java
@@ -0,0 +1,15 @@
+public class Main{
+	
+	public static void main(String[] args){
+	
+		risttahukas r1 = new risttahukas(4, 6, 8);
+		risttahukas r2 = new risttahukas(5.2, 3, 9);
+		risttahukas r3 = new risttahukas(7, 4, 6.7);
+		
+		System.out.println(r1);
+		System.out.println(r2);
+		System.out.println(r3);
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/Proov1.java b/Proov1.java
deleted file mode 100644
index 2a89609..0000000
--- a/Proov1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-public class Proov1{
-	public static void main(String[] args){
-		Ristkylik laud1=new Ristkylik(2, 1);
-		Ristkylik laud2=new Ristkylik(1.5, 1);
-		Ristkylik laud3=new Ristkylik(2, 1.5);
-		System.out.println(laud1.pindala()+" "+laud1.ymberm66t());
-		System.out.println(laud2.pindala());
-		System.out.println(laud3.pindala());
-		System.out.println(laud1);
-		System.out.println(laud2.toString());
-	}
-}
\ No newline at end of file
diff --git a/Ristkylik.java b/Ristkylik.java
deleted file mode 100644
index 9da2e76..0000000
--- a/Ristkylik.java
+++ /dev/null
@@ -1,20 +0,0 @@
-public class Ristkylik{
-	double a, b;
-	public Ristkylik(double pikkus, double laius){
-		if(pikkus<=0){throw new RuntimeException("Sobimatu pikkus");}
-		if(laius <=0){throw new RuntimeException("Sobimatu laius");}
-		a=pikkus;
-		b=laius;
-	}
-	public double pindala(){
-		return a*b;
-	}
-	//lisage funktsioon ristkyliku ymberm66du arvutamiseks
-	public double ymberm66t(){
-		return a+b+a+b;
-	}
-	public String toString(){
-		return "Ristkylik "+a+"x"+b+"m, ymberm66t "+
-		       ymberm66t()+"m, pindala "+pindala()+" ruutmeetrit.";
-	}
-}
\ No newline at end of file
diff --git a/risttahukas.class b/risttahukas.class
new file mode 100644
index 0000000..ff2e144
Binary files /dev/null and b/risttahukas.class differ
diff --git a/risttahukas.java b/risttahukas.java
new file mode 100644
index 0000000..059a755
--- /dev/null
+++ b/risttahukas.java
@@ -0,0 +1,33 @@
+public class risttahukas{
+
+	double a, b, c;
+	public risttahukas(double pikkus, double laius, double k6rgus){
+	
+		a = pikkus;
+		b = laius;
+		c = k6rgus;
+		
+	}
+	
+	public double p6hjaPindala(){
+	
+		return a*b;
+		
+	}
+	
+	public double Ruumala(){
+
+		return a*b*c;
+	
+	}
+	
+	public String toString(){
+	
+		return "Risttahuka("+a+", "+b+", "+c+
+			")p6hjapindala: "+p6hjaPindala()+
+			" ja ruumala: "+Ruumala();
+	
+	}
+	
+
+}
\ No newline at end of file