diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml
new file mode 100644
index 0000000..966d5f5
--- /dev/null
+++ b/.idea/jpa-buddy.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaBuddyIdeaProjectConfig">
+    <option name="renamerInitialized" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 17345cc..7c55908 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,4 +8,7 @@
     <option name="languageLevel" value="ES6" />
   </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index e08aa27..1a3567c 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,19 @@ Go to [this Lab on iCorsi](https://www.icorsi.ch/course/view.php?id=16963).
 
 Property     | Value
 ------------ | -------------
-First Name   | ...
-Last Name    | ...
+First Name   | Claudio
+Last Name    | Maggioni
 
 ## Submission Checklist
 
 Please complete this checklist (turn [ ] into [X]) before you submit:
 
-- [ ] I completed the above Submission Info
-- [ ] I solved the Java part:
-  - [ ] I implemented the Java code
-  - [ ] I completed java/compile.sh
-  - [ ] I completed java/run.sh
-  - [ ] I completed java/disassemble.sh
+- [x] I completed the above Submission Info
+- [x] I solved the Java part:
+  - [x] I implemented the Java code
+  - [x] I completed java/compile.sh
+  - [x] I completed java/run.sh
+  - [x] I completed java/disassemble.sh
 - [ ] I solved the C part:
   - [ ] I implemented the C code
   - [ ] I completed c/compile.sh
diff --git a/java/Main.class b/java/Main.class
new file mode 100644
index 0000000..03ad8d3
Binary files /dev/null and b/java/Main.class differ
diff --git a/java/Main.java b/java/Main.java
index ed2d914..99498b0 100644
--- a/java/Main.java
+++ b/java/Main.java
@@ -1 +1,5 @@
-//TODO Write Java code
+public class Main {
+    public static void main(final String[] args) {
+        System.out.println(System.getProperty("user.name"));
+    }
+}
\ No newline at end of file
diff --git a/java/compile.sh b/java/compile.sh
index d775016..a556454 100755
--- a/java/compile.sh
+++ b/java/compile.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-# TODO Command to compile Main.java with javac
+javac ./Main.java
\ No newline at end of file
diff --git a/java/disassemble.sh b/java/disassemble.sh
index f1414b9..8995844 100755
--- a/java/disassemble.sh
+++ b/java/disassemble.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-# TODO Command to disassemble the compiled Java program with javap
+javap -c ./Main.class
\ No newline at end of file
diff --git a/java/run.sh b/java/run.sh
index 3f527b0..62c5bba 100755
--- a/java/run.sh
+++ b/java/run.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-# TODO Command to run the compiled Java program with java
+java -cp . Main
\ No newline at end of file