Final Submission with Javadocs