Progress of programming, adding javadoc