Initial Commit 2 (Java)