Changes for Start.java WIP