Final Project - Working, Added javadoc comments