Updated for tutorial #7 - Also began adding Javadocs