Freshed the code up a bit. Java is handled differently now and has more automation.