Started adding Javadoc comments