Working Java-version! Next up: Clean delivery version