Started adding javadoc comments