Updated for Tutorial #8 - Worked on Javadocs some more as well