Finishing up Setup.java