Beta v1.0 - Final change to main.java