Start of adding javadoc comments